From 456a8a0a35191331fbd9bcded7a88fa95d7b8ddb Mon Sep 17 00:00:00 2001 From: Lukas Matena Date: Wed, 15 Jan 2025 13:51:09 +0100 Subject: [PATCH] Comment-out sequential arrange tests for now --- src/libseqarrange/CMakeLists.txt | 51 +++++++++++++------------------- 1 file changed, 20 insertions(+), 31 deletions(-) diff --git a/src/libseqarrange/CMakeLists.txt b/src/libseqarrange/CMakeLists.txt index b134ae13a5..fc74199422 100644 --- a/src/libseqarrange/CMakeLists.txt +++ b/src/libseqarrange/CMakeLists.txt @@ -1,10 +1,3 @@ -cmake_minimum_required(VERSION 3.10) -cmake_minimum_required(VERSION 3.10) - -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_CXX_STANDARD_REQUIRED True) -set(CMAKE_CXX_EXTENSIONS False) - find_package(Z3 REQUIRED) slic3r_remap_configs("z3::libz3" RelWithDebInfo Release) @@ -13,41 +6,37 @@ include(Catch) add_library(libseqarrange STATIC src/seq_interface.cpp src/seq_preprocess.cpp src/seq_sequential.cpp src/seq_utilities.cpp) target_include_directories(libseqarrange PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange) -target_link_libraries(libseqarrange libslic3r z3::libz3) +target_link_libraries(libseqarrange PUBLIC libslic3r PRIVATE z3::libz3) add_executable(sequential_arrange src/sequential_prusa.cpp) target_include_directories(sequential_arrange PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange) -target_link_libraries(sequential_arrange libseqarrange) +target_link_libraries(sequential_arrange PRIVATE libseqarrange) add_executable(sequential_decimator src/sequential_decimator.cpp) target_include_directories(sequential_decimator PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange) -target_link_libraries(sequential_decimator libseqarrange) +target_link_libraries(sequential_decimator PRIVATE libseqarrange) -# The tests - separate executables for now. +# Tests - commented out for now -# Commented-out for now - depends on Gecode -# add_executable(seq_test_arrangement test/seq_test_arrangement.cpp) -# target_link_libraries(seq_test_arrangement libseqarrange) +#add_executable(seq_test_polygon test/seq_test_polygon.cpp test/prusaparts.cpp) +#target_link_libraries(seq_test_polygon PRIVATE Catch2::Catch2 libseqarrange) +#target_include_directories(seq_test_polygon PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") -add_executable(seq_test_polygon test/seq_test_polygon.cpp test/prusaparts.cpp) -target_link_libraries(seq_test_polygon Catch2::Catch2 libseqarrange) -target_include_directories(seq_test_polygon PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") +#add_executable(seq_test_sequential test/seq_test_sequential.cpp) +#target_link_libraries(seq_test_sequential PRIVATE libseqarrange) +#target_include_directories(seq_test_sequential PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") -add_executable(seq_test_sequential test/seq_test_sequential.cpp) -target_link_libraries(seq_test_sequential libseqarrange) -target_include_directories(seq_test_sequential PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") +#add_executable(seq_test_preprocess test/seq_test_preprocess.cpp test/prusaparts.cpp) +#target_link_libraries(seq_test_preprocess PRIVATE libseqarrange) +#target_include_directories(seq_test_preprocess PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") -add_executable(seq_test_preprocess test/seq_test_preprocess.cpp test/prusaparts.cpp) -target_link_libraries(seq_test_preprocess libseqarrange) -target_include_directories(seq_test_preprocess PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") +#add_executable(seq_test_interface test/seq_test_interface.cpp) +#target_link_libraries(seq_test_interface PUBLIC libseqarrange) +#target_include_directories(seq_test_interface PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") -add_executable(seq_test_interface test/seq_test_interface.cpp) -target_link_libraries(seq_test_interface libseqarrange) -target_include_directories(seq_test_interface PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange") - -add_test(seq_test_polygon seq_test_polygon) -add_test(seq_test_preprocess seq_test_preprocess) -add_test(seq_test_sequential seq_test_sequential) -add_test(seq_test_interface seq_test_interface) +#add_test(seq_test_polygon seq_test_polygon) +#add_test(seq_test_preprocess seq_test_preprocess) +#add_test(seq_test_sequential seq_test_sequential) +#add_test(seq_test_interface seq_test_interface)