cmake: rework cpp.cmake

google · Sep 22, 2023 · 656fa9e · 656fa9e
1 parent 37e7c92
commit 656fa9e
Show file tree

Hide file tree

Showing 34 changed files with 245 additions and 205 deletions.
diff --git a/cmake/cpp.cmake b/cmake/cpp.cmake
diff --git a/ortools/algorithms/CMakeLists.txt b/ortools/algorithms/CMakeLists.txt
@@ -29,5 +29,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::memory
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::algorithms ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::algorithms ALIAS ${NAME})
diff --git a/ortools/base/CMakeLists.txt b/ortools/base/CMakeLists.txt
@@ -37,5 +37,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::base ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::base ALIAS ${NAME})
diff --git a/ortools/bop/CMakeLists.txt b/ortools/bop/CMakeLists.txt
@@ -28,5 +28,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::synchronization
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::bop ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::bop ALIAS ${NAME})
diff --git a/ortools/constraint_solver/CMakeLists.txt b/ortools/constraint_solver/CMakeLists.txt
@@ -30,5 +30,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::constraint_solver ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::constraint_solver ALIAS ${NAME})
diff --git a/ortools/glop/CMakeLists.txt b/ortools/glop/CMakeLists.txt
@@ -28,5 +28,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::glop ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::glop ALIAS ${NAME})
diff --git a/ortools/glpk/CMakeLists.txt b/ortools/glpk/CMakeLists.txt
@@ -32,4 +32,4 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::str_format
   $<$<BOOL:${USE_GLPK}>:GLPK::GLPK>)
-#add_library(${PROJECT_NAME}::glpk ALIAS ${NAME})
+#add_library(${PROJECT_NAMESPACE}::glpk ALIAS ${NAME})
diff --git a/ortools/graph/CMakeLists.txt b/ortools/graph/CMakeLists.txt
@@ -43,6 +43,6 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto
   $<$<BOOL:${USE_COINOR}>:Coin::Cbc>)
-#add_library(${PROJECT_NAME}::graph ALIAS ${NAME})
+#add_library(${PROJECT_NAMESPACE}::graph ALIAS ${NAME})
diff --git a/ortools/gscip/CMakeLists.txt b/ortools/gscip/CMakeLists.txt
@@ -34,5 +34,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::str_format
   protobuf::libprotobuf
   $<$<BOOL:${USE_SCIP}>:libscip>
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::gscip ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::gscip ALIAS ${NAME})
diff --git a/ortools/gurobi/CMakeLists.txt b/ortools/gurobi/CMakeLists.txt
@@ -30,6 +30,6 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto
   $<$<BOOL:${USE_COINOR}>:Coin::Cbc>)
-#add_library(${PROJECT_NAME}::gurobi ALIAS ${NAME})
+#add_library(${PROJECT_NAMESPACE}::gurobi ALIAS ${NAME})
diff --git a/ortools/init/CMakeLists.txt b/ortools/init/CMakeLists.txt
@@ -28,5 +28,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::flags
   absl::strings
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::init ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::init ALIAS ${NAME})
diff --git a/ortools/linear_solver/CMakeLists.txt b/ortools/linear_solver/CMakeLists.txt
@@ -45,8 +45,8 @@ target_link_libraries(${NAME} PRIVATE
   $<$<BOOL:${USE_PDLP}>:Eigen3::Eigen>
   $<$<BOOL:${USE_SCIP}>:libscip>
   $<$<BOOL:${USE_XPRESS}>:XPRESS::XPRESS>
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::linear_solver ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::linear_solver ALIAS ${NAME})
 
 # solve
 add_executable(solve)

diff --git a/ortools/linear_solver/proto_solver/CMakeLists.txt b/ortools/linear_solver/proto_solver/CMakeLists.txt
@@ -45,8 +45,7 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::status
   absl::str_format
-  protobuf::libprotobuf
   $<$<BOOL:${USE_PDLP}>:Eigen3::Eigen>
   $<$<BOOL:${USE_SCIP}>:libscip>
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::linear_solver ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::linear_solver_proto_solver ALIAS ${NAME})
diff --git a/ortools/linear_solver/wrappers/CMakeLists.txt b/ortools/linear_solver/wrappers/CMakeLists.txt
@@ -25,7 +25,6 @@ target_include_directories(${NAME} PRIVATE
   ${PROJECT_BINARY_DIR})
 target_link_libraries(${NAME} PRIVATE
   absl::status
-  protobuf::libprotobuf
   $<$<BOOL:${USE_SCIP}>:libscip>
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::_linear_solver_wrappers ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::linear_solver_wrappers ALIAS ${NAME})
diff --git a/ortools/lp_data/CMakeLists.txt b/ortools/lp_data/CMakeLists.txt
@@ -29,5 +29,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::str_format
   protobuf::libprotobuf
   ${RE2_DEPS}
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::lp_data ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::lp_data ALIAS ${NAME})
diff --git a/ortools/math_opt/constraints/indicator/CMakeLists.txt b/ortools/math_opt/constraints/indicator/CMakeLists.txt
@@ -22,6 +22,5 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
 #install(TARGETS ${PROJECT_NAME}_math_opt_constraints_indicator EXPORT ${PROJECT_NAME}Targets)
diff --git a/ortools/math_opt/constraints/quadratic/CMakeLists.txt b/ortools/math_opt/constraints/quadratic/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/constraints/second_order_cone/CMakeLists.txt b/ortools/math_opt/constraints/second_order_cone/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/constraints/sos/CMakeLists.txt b/ortools/math_opt/constraints/sos/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/constraints/util/CMakeLists.txt b/ortools/math_opt/constraints/util/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/core/CMakeLists.txt b/ortools/math_opt/core/CMakeLists.txt
@@ -25,5 +25,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/core/c_api/CMakeLists.txt b/ortools/math_opt/core/c_api/CMakeLists.txt
@@ -21,5 +21,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/cpp/CMakeLists.txt b/ortools/math_opt/cpp/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/io/CMakeLists.txt b/ortools/math_opt/io/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/labs/CMakeLists.txt b/ortools/math_opt/labs/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/solvers/CMakeLists.txt b/ortools/math_opt/solvers/CMakeLists.txt
@@ -37,7 +37,6 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
   $<$<BOOL:${USE_GLPK}>:GLPK::GLPK>
   $<$<BOOL:${USE_SCIP}>:libscip>
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/storage/CMakeLists.txt b/ortools/math_opt/storage/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/math_opt/validators/CMakeLists.txt b/ortools/math_opt/validators/CMakeLists.txt
@@ -22,5 +22,4 @@ target_include_directories(${NAME} PUBLIC
   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
 target_link_libraries(${NAME} PRIVATE
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
+  ${PROJECT_NAMESPACE}::math_opt_proto)
diff --git a/ortools/packing/CMakeLists.txt b/ortools/packing/CMakeLists.txt
@@ -26,6 +26,5 @@ target_include_directories(${NAME} PRIVATE
 target_link_libraries(${NAME} PRIVATE
   absl::flags
   absl::strings
-  protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::packing ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::packing ALIAS ${NAME})
diff --git a/ortools/pdlp/CMakeLists.txt b/ortools/pdlp/CMakeLists.txt
@@ -35,7 +35,6 @@ target_link_libraries(${NAME} PRIVATE
   absl::memory
   absl::strings
   absl::str_format
-  protobuf::libprotobuf
   Eigen3::Eigen
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::pdlp ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::pdlp ALIAS ${NAME})
diff --git a/ortools/port/CMakeLists.txt b/ortools/port/CMakeLists.txt
@@ -26,5 +26,5 @@ target_include_directories(${NAME} PRIVATE
 target_link_libraries(${NAME} PRIVATE
   absl::strings
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::port ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::port ALIAS ${NAME})
diff --git a/ortools/sat/CMakeLists.txt b/ortools/sat/CMakeLists.txt
@@ -36,8 +36,8 @@ target_link_libraries(${NAME} PRIVATE
   absl::str_format
   protobuf::libprotobuf
   $<$<BOOL:${USE_COINOR}>:Coin::Cbc>
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::sat ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::sat ALIAS ${NAME})
 
 # Sat Runner
 add_executable(sat_runner)

diff --git a/ortools/scheduling/CMakeLists.txt b/ortools/scheduling/CMakeLists.txt
@@ -26,5 +26,5 @@ target_include_directories(${NAME} PRIVATE
 target_link_libraries(${NAME} PRIVATE
   absl::strings
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::scheduling ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::scheduling ALIAS ${NAME})
diff --git a/ortools/util/CMakeLists.txt b/ortools/util/CMakeLists.txt
@@ -32,5 +32,5 @@ target_link_libraries(${NAME} PRIVATE
   absl::strings
   absl::str_format
   protobuf::libprotobuf
-  ${PROJECT_NAME}::proto)
-#add_library(${PROJECT_NAME}::util ALIAS ${NAME})
+  ${PROJECT_NAMESPACE}::${PROJECT_NAME}_proto)
+#add_library(${PROJECT_NAMESPACE}::util ALIAS ${NAME})