Преглед изворни кода

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