From 80087b8860944fe06db48d3070e38b9f1e94b1ea Mon Sep 17 00:00:00 2001 From: Corentin Le Molgat Date: Fri, 18 Oct 2024 16:08:58 +0200 Subject: [PATCH] cmake: Fix configure when solver are disable --- CMakeLists.txt | 14 ++ cmake/java.cmake | 28 +-- cmake/python.cmake | 62 +++--- .../dotnet/Google.OrTools.runtime.csproj.in | 187 +++++++++--------- 4 files changed, 153 insertions(+), 138 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index df74bc7b50..0fd2682a29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -237,6 +237,12 @@ if(USE_COINOR) CMAKE_DEPENDENT_OPTION(BUILD_Cbc "Build the Cbc dependency Library" OFF "NOT BUILD_DEPS" ON) message(STATUS "Build Cbc: ${BUILD_Cbc}") +else() + set(BUILD_CoinUtils OFF) + set(BUILD_Osi OFF) + set(BUILD_Clp OFF) + set(BUILD_Cgl OFF) + set(BUILD_Cbc OFF) endif() ## GLOP @@ -253,6 +259,8 @@ if(USE_GLPK) CMAKE_DEPENDENT_OPTION(BUILD_GLPK "Build the GLPK dependency Library" OFF "NOT BUILD_DEPS" ON) message(STATUS "Build GLPK: ${BUILD_GLPK}") +else() + set(BUILD_GLPK OFF) endif() ## GUROBI @@ -268,6 +276,8 @@ if(USE_HIGHS) CMAKE_DEPENDENT_OPTION(BUILD_HIGHS "Build the HiGHS dependency Library" OFF "NOT BUILD_DEPS" ON) message(STATUS "Build HiGHS: ${BUILD_HIGHS}") +else() + set(BUILD_HIGHS OFF) endif() ## PDLP @@ -277,6 +287,8 @@ if(USE_PDLP) CMAKE_DEPENDENT_OPTION(BUILD_PDLP "Build the PDLP dependency Library" ON "NOT BUILD_DEPS" ON) message(STATUS "Build PDLP: ${BUILD_PDLP}") +else() + set(BUILD_PDLP OFF) endif() ## SCIP @@ -287,6 +299,8 @@ if(USE_SCIP) CMAKE_DEPENDENT_OPTION(BUILD_SCIP "Build the SCIP dependency Library" OFF "NOT BUILD_DEPS" ON) message(STATUS "Build SCIP: ${BUILD_SCIP}") +else() + set(BUILD_SCIP OFF) endif() # Optional third party solvers (disabled by default) diff --git a/cmake/java.cmake b/cmake/java.cmake index 0dbb9aebdb..f61188c071 100644 --- a/cmake/java.cmake +++ b/cmake/java.cmake @@ -373,42 +373,42 @@ add_custom_command( $ ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ + $,copy,true> + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ + $,copy,true> + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E $,copy,true> - $ + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E $,copy,true> - $ + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E $,copy,true> - $ - $ - $ + $<$:$> + $<$:$> + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E $,copy,true> - $ + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E $,copy,true> - $ - $ - $ + $<$:$> + $<$:$> + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${CMAKE_COMMAND} -E $,copy,true> - $ + $<$:$> ${JAVA_RESSOURCES_PATH}/${JAVA_NATIVE_PROJECT}/ COMMAND ${MAVEN_EXECUTABLE} compile -B diff --git a/cmake/python.cmake b/cmake/python.cmake index 239f7256a2..3a368e9991 100644 --- a/cmake/python.cmake +++ b/cmake/python.cmake @@ -527,48 +527,48 @@ add_custom_command( $ ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - $ - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + $<$:$> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - $ - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + $<$:$> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,copy,true> - $ - ${PYTHON_PROJECT}/.libs + $,copy,true> + $<$:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E - $,SHARED_LIBRARY>,copy,true> - $<$,SHARED_LIBRARY>:$> - ${PYTHON_PROJECT}/.libs + $,SHARED_LIBRARY>,copy,true> + $<$,SHARED_LIBRARY>:$> + ${PYTHON_PROJECT}/.libs COMMAND ${CMAKE_COMMAND} -E touch ${PROJECT_BINARY_DIR}/python/ortools_timestamp MAIN_DEPENDENCY ortools/python/setup.py.in diff --git a/ortools/dotnet/Google.OrTools.runtime.csproj.in b/ortools/dotnet/Google.OrTools.runtime.csproj.in index 97451092d4..3f8dd6932c 100644 --- a/ortools/dotnet/Google.OrTools.runtime.csproj.in +++ b/ortools/dotnet/Google.OrTools.runtime.csproj.in @@ -27,102 +27,103 @@ runtimes/@DOTNET_RID@/native/%(Filename)%(Extension) true