瀏覽代碼

Don't run vcvarsall.bat in luajit step if it was already run.

Possibly works around build errors in AppVeyor
Alex Szpakowski 4 年之前
父節點
當前提交
ded6987a15
共有 1 個文件被更改,包括 3 次插入1 次删除
  1. 3 1
      CMakeLists.txt

+ 3 - 1
CMakeLists.txt

@@ -302,7 +302,9 @@ if(MSVC AND NOT MEGA_ARM64)
 	set(MEGA_LUAJIT_SOURCE_DIR ${CMAKE_BINARY_DIR}/libs/${MEGA_LUAJIT_DIR})
 
 	set(MEGA_LUAJIT_BUILD_BAT "
-		call \"${MEGA_MSVC_VCVARSALL_BAT}\" ${MEGA_MSVC_VCVARSALL_BAT_ARG}
+		if not defined DevEnvDir (
+			call \"${MEGA_MSVC_VCVARSALL_BAT}\" ${MEGA_MSVC_VCVARSALL_BAT_ARG}
+		)
 		cd \"${MEGA_LUAJIT_SOURCE_DIR}/src\"
 		if %1 == \"\" shift /1
 		msvcbuild.bat %1 %2