File tree 1 file changed +12
-2
lines changed
1 file changed +12
-2
lines changed Original file line number Diff line number Diff line change @@ -59,13 +59,23 @@ if(USE_CONAN)
59
59
-s build_type =${CMAKE_BUILD_TYPE}
60
60
-c tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}
61
61
-s compiler.runtime=${CONAN_COMPILER_RUNTIME} --build =missing
62
- # --test-missing
62
+ --test -missing
63
63
)
64
64
else ()
65
65
message (CHECK_FAIL "build freexl failed" )
66
66
endif ()
67
67
endif ()
68
68
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
+
69
79
elseif (APPLE )
70
80
71
81
set (CONAN_RESULT_FILE "conanbuild.sh" )
@@ -105,7 +115,7 @@ if(USE_CONAN)
105
115
endif ()
106
116
107
117
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} )
109
119
110
120
endif ()
111
121
You can’t perform that action at this time.
0 commit comments