Browse Source

[Conan] save install folder to CMake variable

Andrey Filipenkov 3 years ago
parent
commit
e0e075df77
2 changed files with 2 additions and 1 deletions
  1. 1 1
      cmake_modules/VCMIUtils.cmake
  2. 1 0
      conanfile.py

+ 1 - 1
cmake_modules/VCMIUtils.cmake

@@ -142,7 +142,7 @@ function(vcmi_install_conan_deps install_dir)
 	endif()
 	install(CODE "
 		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\")
 	")

+ 1 - 0
conanfile.py

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