always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Fix host_tools patches path

Browse Source
This commit is contained in:
Corentin Le Molgat
2023-09-07 13:09:50 +02:00
parent 9d9c0d4866
commit 4fb8de32cb
2 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/host.CMakeLists.txt
View File

@@ -103,7 +103,7 @@ FetchContent_Declare(
zlib
GIT_REPOSITORY "https://github.com/madler/ZLIB.git"
GIT_TAG "v1.2.13"
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/ZLIB.patch")
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/ZLIB.patch")
FetchContent_MakeAvailable(zlib)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "fetched")
@@ -117,7 +117,7 @@ FetchContent_Declare(
absl
GIT_REPOSITORY "https://github.com/abseil/abseil-cpp.git"
GIT_TAG "20230802.0"
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/abseil-cpp-20230802.0.patch")
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/abseil-cpp-20230802.0.patch")
FetchContent_MakeAvailable(absl)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "fetched")
@@ -133,7 +133,7 @@ FetchContent_Declare(
GIT_REPOSITORY "https://github.com/protocolbuffers/protobuf.git"
GIT_TAG "v24.0"
GIT_SUBMODULES ""
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/../../../patches/protobuf-v24.0.patch")
PATCH_COMMAND git apply "${CMAKE_CURRENT_LIST_DIR}/@PATCHES_PATH@/protobuf-v24.0.patch")
FetchContent_MakeAvailable(protobuf)
list(POP_BACK CMAKE_MESSAGE_INDENT)
message(CHECK_PASS "fetched")

29
cmake/host.cmake
View File

@@ -18,37 +18,18 @@ endif()
message(STATUS "Subproject: HostTools...")
#configure_file(
# ${CMAKE_CURRENT_SOURCE_DIR}/host.CMakeLists.txt
# ${CMAKE_CURRENT_BINARY_DIR}/host_tools/CMakeLists.txt)
#
#execute_process(
# COMMAND ${CMAKE_COMMAND} -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -G "${CMAKE_GENERATOR}" .
# RESULT_VARIABLE result
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/host_tools)
#if(result)
# message(FATAL_ERROR "CMake step for host tools failed: ${result}")
#endif()
#execute_process(
# COMMAND ${CMAKE_COMMAND} --build .
# RESULT_VARIABLE result
# WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/host_tools)
#if(result)
# message(FATAL_ERROR "Build step for host tools failed: ${result}")
#endif()
#file(COPY
# ${CMAKE_CURRENT_SOURCE_DIR}/cmake/host.CMakeLists.txt
# DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/host_tools)
file(RELATIVE_PATH
PATCHES_PATH
${CMAKE_CURRENT_BINARY_DIR}/host_tools
${CMAKE_CURRENT_SOURCE_DIR}/patches)
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/cmake/host.CMakeLists.txt
${CMAKE_CURRENT_BINARY_DIR}/host_tools/CMakeLists.txt
COPYONLY)
@ONLY)
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/host_tools
#COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/host.CMakeLists.txt CMakeLists.txt
COMMAND ${CMAKE_COMMAND} -E remove_directory build
COMMAND ${CMAKE_COMMAND} -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_CURRENT_BINARY_DIR}/host_tools/bin
COMMAND ${CMAKE_COMMAND} --build build --config Release -v