From a04bd59f90d9fbf3d28d7f3b4fbbb2798dc95e9b Mon Sep 17 00:00:00 2001 From: nicolas Date: Fri, 26 Sep 2025 12:10:08 +0200 Subject: [PATCH 1/2] fix linking errors when disabling c adaptor --- cpp/tests/linear_programming/CMakeLists.txt | 78 +++++++++++---------- 1 file changed, 40 insertions(+), 38 deletions(-) diff --git a/cpp/tests/linear_programming/CMakeLists.txt b/cpp/tests/linear_programming/CMakeLists.txt index 66bed4037..96588748e 100644 --- a/cpp/tests/linear_programming/CMakeLists.txt +++ b/cpp/tests/linear_programming/CMakeLists.txt @@ -26,46 +26,48 @@ ConfigureTest(PDLP_TEST # - C API Tests---------------------------------------------------------------------- # The C API tests require a separate library to be linked against. So we don't use the ConfigureTest macro. -add_library(c_api_tester "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests/c_api_test.c") -target_include_directories(c_api_tester - PRIVATE - ${CUOPT_SOURCE_DIR}/include - PUBLIC - "$" -) -target_include_directories(c_api_tester - PRIVATE - "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests" -) +if (NOT SKIP_C_PYTHON_ADAPTERS) + add_library(c_api_tester "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests/c_api_test.c") + target_include_directories(c_api_tester + PRIVATE + ${CUOPT_SOURCE_DIR}/include + PUBLIC + "$" + ) + target_include_directories(c_api_tester + PRIVATE + "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests" + ) -add_executable(C_API_TEST "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests/c_api_tests.cpp") + add_executable(C_API_TEST "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests/c_api_tests.cpp") -target_include_directories(C_API_TEST - PRIVATE - "${CUOPT_TEST_DIR}/../src" - "${CUOPT_TEST_DIR}/../libmps_parser/src" - "${CUOPT_TEST_DIR}" - "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests" -) + target_include_directories(C_API_TEST + PRIVATE + "${CUOPT_TEST_DIR}/../src" + "${CUOPT_TEST_DIR}/../libmps_parser/src" + "${CUOPT_TEST_DIR}" + "${CMAKE_CURRENT_SOURCE_DIR}/c_api_tests" + ) -target_link_libraries(C_API_TEST - PRIVATE - mps_parser - cuopt - cuopttestutils - c_api_tester - GTest::gmock - GTest::gmock_main - GTest::gtest - GTest::gtest_main - ${CUOPT_PRIVATE_CUDA_LIBS} -) + target_link_libraries(C_API_TEST + PRIVATE + mps_parser + cuopt + cuopttestutils + c_api_tester + GTest::gmock + GTest::gmock_main + GTest::gtest + GTest::gtest_main + ${CUOPT_PRIVATE_CUDA_LIBS} + ) -add_test(NAME C_API_TEST COMMAND C_API_TEST) + add_test(NAME C_API_TEST COMMAND C_API_TEST) -install( - TARGETS C_API_TEST - COMPONENT testing - DESTINATION bin/gtests/libcuopt - EXCLUDE_FROM_ALL -) + install( + TARGETS C_API_TEST + COMPONENT testing + DESTINATION bin/gtests/libcuopt + EXCLUDE_FROM_ALL + ) +endif() \ No newline at end of file From afe68ec6d612240a7869db60a17bd9099db0a66c Mon Sep 17 00:00:00 2001 From: nicolas Date: Fri, 26 Sep 2025 12:53:32 +0200 Subject: [PATCH 2/2] fixed styling Signed-off-by: nicolas --- cpp/tests/linear_programming/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/tests/linear_programming/CMakeLists.txt b/cpp/tests/linear_programming/CMakeLists.txt index 96588748e..ab64f045d 100644 --- a/cpp/tests/linear_programming/CMakeLists.txt +++ b/cpp/tests/linear_programming/CMakeLists.txt @@ -70,4 +70,4 @@ if (NOT SKIP_C_PYTHON_ADAPTERS) DESTINATION bin/gtests/libcuopt EXCLUDE_FROM_ALL ) -endif() \ No newline at end of file +endif()