Merge branch 'bug/fix_compiling' into main

henrivdr · Aug 18, 2024 · e1e6334 · e1e6334
2 parents af16cd6 + a1dbe2b
commit e1e6334
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/BuildLinux.sh b/BuildLinux.sh
@@ -122,7 +122,7 @@ then
     fi
     if [ ! -d "deps/build" ]
     then
-        mkdir deps/build
+        mkdir -p deps/build
     fi
     if [[ -n "${BUILD_DEBUG}" ]]
     then

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -410,7 +410,8 @@ endif()
 # set(Boost_COMPILER "-mgw81")
 # boost::process was introduced first in version 1.64.0,
 # boost::beast::detail::base64 was introduced first in version 1.66.0
-find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options)
+#find_package(Boost 1.66 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options)
+find_package(Boost 1.84.0 REQUIRED COMPONENTS system filesystem thread log locale regex chrono atomic date_time iostreams program_options)
 
 add_library(boost_libs INTERFACE)
 add_library(boost_headeronly INTERFACE)

diff --git a/src/libslic3r/libslic3r_version.h.in b/src/libslic3r/libslic3r_version.h.in
@@ -10,6 +10,13 @@
 //#define SLIC3R_RC_VERSION "@SLIC3R_VERSION@"
 #define BBL_RELEASE_TO_PUBLIC @BBL_RELEASE_TO_PUBLIC@
 #define BBL_INTERNAL_TESTING @BBL_INTERNAL_TESTING@
-#define ORCA_CHECK_GCODE_PLACEHOLDERS @ORCA_CHECK_GCODE_PLACEHOLDERS@
+
+// @ORCA_CHECK_GCODE_PLACEHOLDERS@
+// Logic taken from ./src/libslic3r/GCode.hpp
+#if !defined(NDEBUG)
+    #define ORCA_CHECK_GCODE_PLACEHOLDERS 1
+#else
+    #define ORCA_CHECK_GCODE_PLACEHOLDERS 0
+#endif
 
 #endif /* __SLIC3R_VERSION_H */
diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt
@@ -10,7 +10,8 @@
 
 # see bug report: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=925540
 
-find_package(Qhull 7.2 QUIET)
+#find_package(Qhull 7.2 QUIET) # Qhull::qhullcpp target was not found
+find_package(Qhull 8.0.2 QUIET) # warns only deps 8.0.1 found
 
 add_library(qhull INTERFACE)