Skip to content

Commit 4ac445d

Browse files
committed
make find build dir more generally
1 parent b388670 commit 4ac445d

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

Tools/CMake/Conan.cmake

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,23 @@ if(USE_CONAN)
5959
-s build_type=${CMAKE_BUILD_TYPE}
6060
-c tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}
6161
-s compiler.runtime=${CONAN_COMPILER_RUNTIME} --build=missing
62-
#--test-missing
62+
--test-missing
6363
)
6464
else()
6565
message(CHECK_FAIL "build freexl failed")
6666
endif()
6767
endif()
6868

69+
# find conan_toolchain.cmake generated in local
70+
file(GLOB_RECURSE CONAN_TOOLCHAIN_PATH ${freexl_SOURCE_DIR}/freexl/test_package/build/*/generators/conan_toolchain.cmake)
71+
list(GET CONAN_TOOLCHAIN_PATH 0 CONAN_TOOLCHAIN_PATH)
72+
if (EXISTS ${CONAN_TOOLCHAIN_PATH})
73+
get_filename_component(CONAN_TOOLCHAIN_PATH_DIR ${CONAN_TOOLCHAIN_PATH} DIRECTORY)
74+
message(STATUS "freexl conan toolchain directory: ${CONAN_TOOLCHAIN_PATH_DIR}")
75+
else ()
76+
message(FATAL_ERROR "freexl conan toolchain not found!")
77+
endif ()
78+
6979
elseif(APPLE)
7080

7181
set(CONAN_RESULT_FILE "conanbuild.sh")
@@ -105,7 +115,7 @@ if(USE_CONAN)
105115
endif()
106116

107117
include(${CMAKE_BINARY_DIR}/_conan_build/conan_toolchain.cmake)
108-
include(${freexl_SOURCE_DIR}/freexl/test_package/build/msvc-194-x86_64-17-${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake)
118+
include(${CONAN_TOOLCHAIN_PATH})
109119

110120
endif()
111121

0 commit comments

Comments
 (0)