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

[Conan] save install folder to CMake variable

Browse Source
This commit is contained in:
Andrey Filipenkov 2022-10-22 16:54:07 +03:00
parent d1ab611b4f
commit e0e075df77
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake_modules/VCMIUtils.cmake
View File

@ -142,7 +142,7 @@ function(vcmi_install_conan_deps install_dir)
endif() endif()
install(CODE " install(CODE "
execute_process(COMMAND execute_process(COMMAND
conan imports \"${CMAKE_SOURCE_DIR}\" --install-folder \"${CMAKE_SOURCE_DIR}/conan-generated\" --import-folder \"${install_dir}\" conan imports \"${CMAKE_SOURCE_DIR}\" --install-folder \"${CONAN_INSTALL_FOLDER}\" --import-folder \"${install_dir}\"
) )
file(REMOVE \"${install_dir}/conan_imports_manifest.txt\") file(REMOVE \"${install_dir}/conan_imports_manifest.txt\")
") ")

1
conanfile.py
View File

@ -192,6 +192,7 @@ class VCMI(ConanFile):
def generate(self): def generate(self):
tc = CMakeToolchain(self) tc = CMakeToolchain(self)
tc.variables["USING_CONAN"] = True tc.variables["USING_CONAN"] = True
tc.variables["CONAN_INSTALL_FOLDER"] = self.install_folder
tc.generate() tc.generate()
deps = CMakeDeps(self) deps = CMakeDeps(self)