Skip to content

Commit 4198271

Browse files
MizuxMizux
committed
cmake cleanup
1 parent 84e6fc0 commit 4198271

File tree

8 files changed

+21
-42
lines changed

8 files changed

+21
-42
lines changed

‎ortools/constraint_solver/python/CMakeLists.txt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ target_compile_definitions(pywrapcp PUBLIC "PY3")
3030
if(APPLE)
3131
set_target_properties(pywrapcp PROPERTIES
3232
SUFFIX ".so"
33-
INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs"
34-
)
33+
INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs")
3534
target_link_options(pywrapcp PRIVATE "LINKER:-undefined,dynamic_lookup")
3635
elseif(UNIX)
3736
set_target_properties(pywrapcp PROPERTIES

‎ortools/init/python/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ set_target_properties(init_pybind11 PROPERTIES
1919
if(APPLE)
2020
set_target_properties(init_pybind11 PROPERTIES
2121
SUFFIX ".so"
22-
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
23-
)
22+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs")
2423
elseif(UNIX)
2524
set_target_properties(init_pybind11 PROPERTIES
26-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
27-
)
25+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs")
2826
endif()
2927

3028
target_link_libraries(init_pybind11 PRIVATE ${PROJECT_NAMESPACE}::ortools)

‎ortools/linear_solver/python/CMakeLists.txt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ target_compile_definitions(pywraplp PUBLIC "PY3")
2929
if(APPLE)
3030
set_target_properties(pywraplp PROPERTIES
3131
SUFFIX ".so"
32-
INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs"
33-
)
32+
INSTALL_RPATH "@loader_path;@loader_path/../../${PROJECT_NAME}/.libs")
3433
target_link_options(pywraplp PRIVATE "LINKER:-undefined,dynamic_lookup")
3534
elseif(UNIX)
3635
set_target_properties(pywraplp PROPERTIES
@@ -57,19 +56,16 @@ target_include_directories(model_builder_helper_pybind11 PRIVATE
5756
if(APPLE)
5857
set_target_properties(model_builder_helper_pybind11 PROPERTIES
5958
SUFFIX ".so"
60-
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
61-
)
59+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs")
6260
elseif(UNIX)
6361
set_target_properties(model_builder_helper_pybind11 PROPERTIES
64-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
65-
)
62+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs")
6663
endif()
6764

6865
target_link_libraries(model_builder_helper_pybind11 PRIVATE
6966
${PROJECT_NAMESPACE}::ortools
7067
pybind11_native_proto_caster
71-
Eigen3::Eigen
72-
)
68+
Eigen3::Eigen)
7369
add_library(${PROJECT_NAMESPACE}::model_builder_helper_pybind11 ALIAS model_builder_helper_pybind11)
7470

7571
if(BUILD_TESTING)

‎ortools/math_opt/core/python/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,19 @@ if(APPLE)
2020
set_target_properties(math_opt_pybind11 PROPERTIES
2121
SUFFIX ".so"
2222
INSTALL_RPATH
23-
"@loader_path;@loader_path/../../../../${PYTHON_PROJECT}/.libs;@loader_path/../../../../pybind11_abseil"
24-
)
23+
"@loader_path;@loader_path/../../../../${PYTHON_PROJECT}/.libs;@loader_path/../../../../pybind11_abseil")
2524
elseif(UNIX)
2625
set_target_properties(math_opt_pybind11 PROPERTIES
2726
INSTALL_RPATH
28-
"$ORIGIN:$ORIGIN/../../../../${PYTHON_PROJECT}/.libs:$ORIGIN/../../../../pybind11_abseil"
29-
)
27+
"$ORIGIN:$ORIGIN/../../../../${PYTHON_PROJECT}/.libs:$ORIGIN/../../../../pybind11_abseil")
3028
endif()
3129

3230
target_link_libraries(math_opt_pybind11 PRIVATE
3331
${PROJECT_NAMESPACE}::ortools
3432
pybind11_abseil::absl_casters
3533
pybind11_abseil::status_casters
3634
pybind11_native_proto_caster
37-
protobuf::libprotobuf
38-
)
35+
protobuf::libprotobuf)
3936
add_library(${PROJECT_NAMESPACE}::math_opt_pybind11 ALIAS math_opt_pybind11)
4037

4138
if(BUILD_TESTING)

‎ortools/pdlp/python/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,15 @@ set_target_properties(pdlp_pybind11 PROPERTIES
1818
if(APPLE)
1919
set_target_properties(pdlp_pybind11 PROPERTIES
2020
SUFFIX ".so"
21-
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
22-
)
21+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs")
2322
elseif(UNIX)
2423
set_target_properties(pdlp_pybind11 PROPERTIES
25-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
26-
)
24+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs")
2725
endif()
2826
target_link_libraries(pdlp_pybind11 PRIVATE
2927
${PROJECT_NAMESPACE}::ortools
3028
pybind11_native_proto_caster
31-
protobuf::libprotobuf
32-
)
29+
protobuf::libprotobuf)
3330
target_include_directories(pdlp_pybind11 PRIVATE ${protobuf_SOURCE_DIR})
3431
add_library(${PROJECT_NAMESPACE}::pdlp_pybind11 ALIAS pdlp_pybind11)
3532

‎ortools/sat/python/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ set_target_properties(swig_helper_pybind11 PROPERTIES
1919
if(APPLE)
2020
set_target_properties(swig_helper_pybind11 PROPERTIES
2121
SUFFIX ".so"
22-
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
23-
)
22+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs")
2423
elseif(UNIX)
2524
set_target_properties(swig_helper_pybind11 PROPERTIES
26-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
27-
)
25+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs")
2826
endif()
2927
target_link_libraries(swig_helper_pybind11 PRIVATE
3028
${PROJECT_NAMESPACE}::ortools
3129
pybind11_native_proto_caster
32-
protobuf::libprotobuf
33-
)
30+
protobuf::libprotobuf)
3431

3532
target_include_directories(swig_helper_pybind11 PRIVATE ${protobuf_SOURCE_DIR})
3633
add_library(${PROJECT_NAMESPACE}::swig_helper_pybind11 ALIAS swig_helper_pybind11)

‎ortools/scheduling/python/CMakeLists.txt‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ set_target_properties(rcpsp_pybind11 PROPERTIES
1919
if(APPLE)
2020
set_target_properties(rcpsp_pybind11 PROPERTIES
2121
SUFFIX ".so"
22-
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
23-
)
22+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs")
2423
elseif(UNIX)
2524
set_target_properties(rcpsp_pybind11 PROPERTIES
26-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
27-
)
25+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs")
2826
endif()
2927
target_link_libraries(rcpsp_pybind11 PRIVATE
3028
${PROJECT_NAMESPACE}::ortools
3129
pybind11_native_proto_caster
32-
protobuf::libprotobuf
33-
)
30+
protobuf::libprotobuf)
3431

3532
target_include_directories(rcpsp_pybind11 PRIVATE ${protobuf_SOURCE_DIR})
3633
add_library(${PROJECT_NAMESPACE}::rcpsp_pybind11 ALIAS rcpsp_pybind11)

‎ortools/util/python/CMakeLists.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,10 @@ set_target_properties(sorted_interval_list_pybind11 PROPERTIES
1919
if(APPLE)
2020
set_target_properties(sorted_interval_list_pybind11 PROPERTIES
2121
SUFFIX ".so"
22-
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs"
23-
)
22+
INSTALL_RPATH "@loader_path;@loader_path/../../../${PYTHON_PROJECT}/.libs")
2423
elseif(UNIX)
2524
set_target_properties(sorted_interval_list_pybind11 PROPERTIES
26-
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs"
27-
)
25+
INSTALL_RPATH "$ORIGIN:$ORIGIN/../../../${PYTHON_PROJECT}/.libs")
2826
endif()
2927

3028
target_link_libraries(sorted_interval_list_pybind11 PRIVATE ${PROJECT_NAMESPACE}::ortools)

0 commit comments

Comments
 (0)