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 @@ -58,13 +58,23 @@ if(USE_CONAN)
58
58
-s build_type =${CMAKE_BUILD_TYPE}
59
59
-c tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}
60
60
-s compiler.runtime=${CONAN_COMPILER_RUNTIME} --build =missing
61
- # --test-missing
61
+ --test -missing
62
62
)
63
63
else ()
64
64
message (CHECK_FAIL "build freexl failed" )
65
65
endif ()
66
66
endif ()
67
67
68
+ # find conan_toolchain.cmake generated in local
69
+ file (GLOB_RECURSE CONAN_TOOLCHAIN_PATH ${freexl_SOURCE_DIR} /freexl/test_package/build /*/generators/conan_toolchain.cmake)
70
+ list (GET CONAN_TOOLCHAIN_PATH 0 CONAN_TOOLCHAIN_PATH)
71
+ if (EXISTS ${CONAN_TOOLCHAIN_PATH} )
72
+ get_filename_component (CONAN_TOOLCHAIN_PATH_DIR ${CONAN_TOOLCHAIN_PATH} DIRECTORY )
73
+ message (STATUS "freexl conan toolchain directory: ${CONAN_TOOLCHAIN_PATH_DIR} " )
74
+ else ()
75
+ message (FATAL_ERROR "freexl conan toolchain not found!" )
76
+ endif ()
77
+
68
78
elseif (APPLE )
69
79
70
80
set (CONAN_RESULT_FILE "conanbuild.sh" )
@@ -104,7 +114,7 @@ if(USE_CONAN)
104
114
endif ()
105
115
106
116
include (${CMAKE_BINARY_DIR} /_conan_build/conan_toolchain.cmake)
107
- include (${freexl_SOURCE_DIR} /freexl/test_package/ build / msvc -194-x86_64-17- ${CMAKE_BUILD_TYPE} /generators/conan_toolchain.cmake )
117
+ include (${CONAN_TOOLCHAIN_PATH} )
108
118
109
119
endif ()
110
120
You can’t perform that action at this time.
0 commit comments