Skip to content

Commit 296ac83

Browse files
committed
chore: patch and build freexl locally
1 parent f566c0e commit 296ac83

File tree

1 file changed

+32
-6
lines changed

1 file changed

+32
-6
lines changed

Tools/CMake/Conan.cmake

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,37 @@ if(USE_CONAN)
2828
if(WIN32)
2929

3030
message(STATUS " ${CONAN_COMPILER_RUNTIME}")
31-
31+
32+
message(STATUS "Cloning private freexl dependency")
33+
set(FREEXL_VERSION "2.1.0-dev")
34+
FetchContent_Declare(
35+
freexl
36+
GIT_REPOSITORY https://github.com/shun2wang/conan-recipes.git
37+
GIT_TAG f014849188bddd01b9ca3ddf63dde8d2e3a45314
38+
)
39+
FetchContent_MakeAvailable(freexl)
40+
if(freexl_POPULATED)
41+
42+
message(STATUS "Compiling freexl dependency")
43+
execute_process(
44+
COMMAND_ECHO STDOUT
45+
WORKING_DIRECTORY ${freexl_SOURCE_DIR}/freexl
46+
COMMAND
47+
conan create . --version=${FREEXL_VERSION}
48+
-s build_type=${CMAKE_BUILD_TYPE}
49+
-c tools.cmake.cmaketoolchain:generator=${CMAKE_GENERATOR}
50+
-s compiler.runtime=${CONAN_COMPILER_RUNTIME} --build=missing
51+
#--test-missing
52+
)
53+
else()
54+
message(CHECK_FAIL "build freexl failed")
55+
endif()
56+
3257
execute_process(
3358
COMMAND_ECHO STDOUT
3459
WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
3560
COMMAND
36-
conan install ${CONAN_FILE_PATH} --output-folder=${CMAKE_BINARY_DIR}/conan_build
61+
conan install ${CONAN_FILE_PATH} --output-folder=${CMAKE_BINARY_DIR}/_conan_build
3762
-s build_type=${CMAKE_BUILD_TYPE}
3863
-s compiler.runtime=${CONAN_COMPILER_RUNTIME} --build=missing)
3964

@@ -49,7 +74,7 @@ if(USE_CONAN)
4974
COMMAND
5075
conan install ${CONAN_FILE_PATH} -s build_type=${CMAKE_BUILD_TYPE} -s
5176
os.version=${CMAKE_OSX_DEPLOYMENT_TARGET} -s
52-
arch=${CONAN_ARCH} -s arch_build=${CONAN_ARCH} --build=missing -of ${CMAKE_BINARY_DIR}/conan_build)
77+
arch=${CONAN_ARCH} -s arch_build=${CONAN_ARCH} --build=missing -of ${CMAKE_BINARY_DIR}/_conan_build)
5378

5479
else()
5580

@@ -59,13 +84,13 @@ if(USE_CONAN)
5984
COMMAND
6085
conan install ${CONAN_FILE_PATH} -s build_type=${CMAKE_BUILD_TYPE} -s
6186
os.version=${CMAKE_OSX_DEPLOYMENT_TARGET}
62-
--build=missing -of ${CMAKE_BINARY_DIR}/conan_build)
87+
--build=missing -of ${CMAKE_BINARY_DIR}/_conan_build)
6388

6489
endif()
6590

6691
endif()
6792

68-
if(EXISTS ${CMAKE_BINARY_DIR}/conan_build/${CONAN_RESULT_FILE})
93+
if(EXISTS ${CMAKE_BINARY_DIR}/_conan_build/${CONAN_RESULT_FILE})
6994
message(CHECK_PASS "successful")
7095
else()
7196
message(CHECK_FAIL "unsuccessful")
@@ -75,7 +100,8 @@ if(USE_CONAN)
75100
)
76101
endif()
77102

78-
include(${CMAKE_BINARY_DIR}/conan_build/conan_toolchain.cmake)
103+
include(${CMAKE_BINARY_DIR}/_conan_build/conan_toolchain.cmake)
104+
include(${freexl_SOURCE_DIR}/freexl/test_package/build/msvc-194-x86_64-17-${CMAKE_BUILD_TYPE}/generators/conan_toolchain.cmake)
79105

80106
endif()
81107

0 commit comments

Comments
 (0)