firoorg · aleflm · May 15, 2025 · May 15, 2025 · May 15, 2025 · May 15, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -586,6 +586,38 @@ foreach(func ${BUILTIN_FUNCTIONS})
     endif()
 endforeach()
 
+check_cxx_source_compiles(
+  "#if __cplusplus >= 201703L
+  int main() {
+      [[maybe_unused]] int x = 42;
+      return 0;
+  }
+  #else
+  #error \"Requires C++17\"
+  #endif"
+  HAVE_MAYBE_UNUSED
+)
+if(${HAVE_MAYBE_UNUSED})
+    message(STATUS "Compiler supports maybe_unused" )
+    add_compile_definitions(HAVE_MAYBE_UNUSED=1)
+else()
+    message(WARNING "Compiler does not support maybe_unused")
+    check_cxx_source_compiles(
+      "int main() {
+          __attribute__((unused)) int x = 42;
+          return 0;
+      }"
+      HAVE_ATTRIBUTE_UNUSED
+    )
+    if(${HAVE_ATTRIBUTE_UNUSED})
+        message(STATUS "Compiler supports __attribute__((unused))" )
+        add_compile_definitions(HAVE_ATTRIBUTE_UNUSED=1)
+    else()
+        message(WARNING "Compiler does not support __attribute__((unused))")
+        message(WARNING "Please use a compiler that supports C++17 or __attribute__((unused))")
+    endif()
+endif()
+
 include(cmake/ccache.cmake)
 
 add_library(warn_interface INTERFACE)
@@ -837,6 +869,8 @@ add_maintenance_targets()
 add_windows_deploy_target()
 add_macos_deploy_target()
 
+include_directories(${CMAKE_SOURCE_DIR}/src)
+
 message("\n")
 message("Configure summary")
 message("=================")

diff --git a/Makefile.am b/Makefile.am
@@ -4,6 +4,7 @@
 
 ACLOCAL_AMFLAGS = -I build-aux/m4
 SUBDIRS = src
+AM_CPPFLAGS = -I$(top_srcdir)/src
 .PHONY: deploy FORCE
 .INTERMEDIATE: $(OSX_TEMP_ISO)
 

diff --git a/cmake/module/AddBoostIfNeeded.cmake b/cmake/module/AddBoostIfNeeded.cmake
@@ -56,6 +56,28 @@ function(add_boost_if_needed)
   # Define the macro if the test passed
   if(HAVE_WORKING_BOOST_SLEEP_FOR)
       add_compile_definitions(HAVE_WORKING_BOOST_SLEEP_FOR=1)
+  else()
+      # testing for boost::this_thread::sleep(boost::posix_time::milliseconds(n));
+      set(SLEEPTEST_SOURCE_CODE "
+      #include <boost/thread/thread.hpp>
+      #include <boost/version.hpp>
+
+      int main() {
+      #if BOOST_VERSION >= 105000 && (!defined(BOOST_HAS_NANOSLEEP) || BOOST_VERSION >= 105200)
+          boost::this_thread::sleep(boost::chrono::milliseconds(0));
+          return 0;
+      #else
+          choke me
+      #endif
+      }
+      ")
+      # Check if the test source code compiles
+      check_cxx_source_compiles("${SLEEPTEST_SOURCE_CODE}" HAVE_WORKING_BOOST_SLEEP)
+      if(HAVE_WORKING_BOOST_SLEEP)
+          add_compile_definitions(HAVE_WORKING_BOOST_SLEEP=1)
+      else()
+          message(FATAL_ERROR "Couldn't find a working boost sleep_for or sleep function. Please check your Boost.")
+      endif()
   endif()
 
   mark_as_advanced(Boost_INCLUDE_DIR)