Some more CMake polishing

src/libseqarrange/CMakeLists.txt

@@ -1,5 +1,46 @@
 cmake_minimum_required(VERSION 3.10)
+cmake_minimum_required(VERSION 3.10)
 
-add_subdirectory(src)
-add_subdirectory(test)
+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)
+
+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)
+
+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)
+
+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)
+
+
+
+# The tests - separate executables 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 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 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 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 libseqarrange)
+target_include_directories(seq_test_interface PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/src" "${CMAKE_CURRENT_SOURCE_DIR}/include/libseqarrange")
 

src/libseqarrange/include/libseqarrange/seq_interface.hpp

@@ -18,9 +18,6 @@
 #include "libslic3r/Polygon.hpp"
 #include "libslic3r/Geometry/ConvexHull.hpp"
 
-#include "seq_defs.hpp"
-
-
 /*----------------------------------------------------------------*/
 
 using namespace Slic3r;
@@ -96,7 +93,7 @@ struct SolverConfiguration
     // Setting printer type is obsolete, will be removed    
     PrinterType printer_type;
     
-    string optimization_timeout;    
+    std::string optimization_timeout;    
 };
 
     

src/libseqarrange/src/CMakeLists.txt

@@ -1,23 +0,0 @@
-cmake_minimum_required(VERSION 3.10)
-
-project(Surynek LANGUAGES CXX)
-
-set(CMAKE_CXX_STANDARD 17)
-set(CMAKE_CXX_STANDARD_REQUIRED True)
-set(CMAKE_CXX_EXTENSIONS False)
-
-add_library(libseqarrange STATIC seq_interface.cpp seq_preprocess.cpp seq_sequential.cpp seq_utilities.cpp)
-add_executable(sequential_arrange sequential_prusa.cpp)
-add_executable(sequential_decimator sequential_decimator.cpp)
-
-target_include_directories(libseqarrange PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../include)
-
-find_package(Z3 REQUIRED)
-slic3r_remap_configs("z3::libz3" RelWithDebInfo Release)
-
-target_link_libraries(libseqarrange libslic3r z3::libz3)
-target_link_libraries(sequential_arrange libseqarrange)
-target_link_libraries(sequential_decimator libseqarrange)
-
-
-

src/libseqarrange/test/CMakeLists.txt

@@ -1,22 +0,0 @@
-# Minimum required version of CMake
-cmake_minimum_required(VERSION 3.10)
-
-# Set C++ standard and flags
-set(CMAKE_CXX_STANDARD 17)
-
-
-# add_executable(seq_test_arrangement seq_test_arrangement.cpp)
-# target_link_libraries(seq_test_arrangement libseqarrange)
-
-add_executable(seq_test_polygon seq_test_polygon.cpp prusaparts.cpp)
-target_link_libraries(seq_test_polygon libseqarrange)
-
-add_executable(seq_test_sequential seq_test_sequential.cpp)
-target_link_libraries(seq_test_sequential libseqarrange)
-
-add_executable(seq_test_preprocess seq_test_preprocess.cpp prusaparts.cpp)
-target_link_libraries(seq_test_preprocess libseqarrange)
-
-add_executable(seq_test_interface seq_test_interface.cpp)
-target_link_libraries(seq_test_interface libseqarrange)
-

src/slic3r/CMakeLists.txt

@@ -455,6 +455,7 @@ target_link_libraries(
     stb_dxt
     fastfloat
     boost_headeronly
+    libseqarrange
 )
 
 if (MSVC)

src/slic3r/GUI/ArrangeHelper.cpp

@@ -5,7 +5,7 @@
 
 #include <string>
 
-#include "libseqarrange/include/seq_interface.hpp"
+#include "libseqarrange/seq_interface.hpp"
 
 
 namespace Slic3r {