cmake: Fix mathop_build when USE_SCIP=OFF

google · Sep 4, 2023 · b23ee0b · b23ee0b
1 parent 67fb493
commit b23ee0b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
@@ -203,7 +203,7 @@ if(USE_PDLP)
   file(GLOB_RECURSE pdlp_proto_files RELATIVE ${PROJECT_SOURCE_DIR} "ortools/pdlp/*.proto")
   list(APPEND proto_files ${pdlp_proto_files})
 endif()
-if(USE_SCIP)
+if(USE_SCIP OR BUILD_MATH_OPT)
   file(GLOB_RECURSE gscip_proto_files RELATIVE ${PROJECT_SOURCE_DIR} "ortools/gscip/*.proto")
   list(APPEND proto_files ${gscip_proto_files})
 endif()

diff --git a/ortools/math_opt/CMakeLists.txt b/ortools/math_opt/CMakeLists.txt
@@ -28,6 +28,8 @@ endif()
 
 if(NOT USE_SCIP)
   list(FILTER _SRCS EXCLUDE REGEX "/gscip/")
+  list(FILTER _SRCS EXCLUDE REGEX "/gscip_.*.h$")
+  list(FILTER _SRCS EXCLUDE REGEX "/gscip_.*.cc$")
 endif()
 
 set(NAME ${PROJECT_NAME}_math_opt)