games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-10-31 00:07:39 +02:00
Code Issues Releases Activity

[cmake][windows] generate bat files that use conanrun.ps1

Browse Source
This commit is contained in:
Andrey Filipenkov
2025-10-16 14:21:29 +03:00
parent e81d5bc973
commit 07b41f53cb
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmake_modules/VCMIUtils.cmake
View File

@@ -164,8 +164,12 @@ function(vcmi_create_exe_shim tgt)
if(NOT CONAN_RUNENV_SCRIPT) if(NOT CONAN_RUNENV_SCRIPT)
return() return()
endif() endif()
file(GENERATE OUTPUT "$<TARGET_FILE_DIR:${tgt}>/$<TARGET_FILE_BASE_NAME:${tgt}>.bat" CONTENT
"call ${CONAN_RUNENV_SCRIPT} set(exe "%~dp0$<TARGET_FILE_NAME:${tgt}>")
@start $<TARGET_FILE_NAME:${tgt}>" if(EXISTS "${CONAN_RUNENV_SCRIPT}.bat")
) set(batContent "call \"${CONAN_RUNENV_SCRIPT}.bat\" & start \"\" \"${exe}\"")
else()
set(batContent "powershell -ExecutionPolicy Bypass -Command \"& '${CONAN_RUNENV_SCRIPT}.ps1' ; & '${exe}'\"")
endif()
file(GENERATE OUTPUT "$<TARGET_FILE_DIR:${tgt}>/$<TARGET_FILE_BASE_NAME:${tgt}>.bat" CONTENT "${batContent}")
endfunction() endfunction()

2
conanfile.py
View File

@@ -50,5 +50,5 @@ class VCMIApp(VCMI):
tc.variables["CMAKE_ANDROID_API"] = str(self.settings.os.api_level) tc.variables["CMAKE_ANDROID_API"] = str(self.settings.os.api_level)
tc.variables["SDL_JAVA_SRC_DIR"] = os.path.join(self.dependencies.host["sdl"].package_folder, "share", "java", "SDL2") tc.variables["SDL_JAVA_SRC_DIR"] = os.path.join(self.dependencies.host["sdl"].package_folder, "share", "java", "SDL2")
elif self.settings.os == "Windows": elif self.settings.os == "Windows":
tc.variables["CONAN_RUNENV_SCRIPT"] = self._pathForCmake(os.path.join(self.build_folder, "conanrun.bat")) tc.variables["CONAN_RUNENV_SCRIPT"] = self._pathForCmake(os.path.join(self.build_folder, "conanrun"))
tc.generate() tc.generate()