Merge branch 'WIP' of github.com:Chrismarsh/CHM into WIP

Chrismarsh · May 10, 2024 · 9d28527 · 9d28527
2 parents 9a7d518 + 809ea6d
commit 9d28527
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -203,7 +203,6 @@ if(BUILD_WITH_CONAN)
 endif()
 
 
-add_compile_definitions(SPDLOG_FMT_EXTERNAL)
 message("-- Final compile: ${CHM_BUILD_FLAGS}")
 
 add_library(CHMmath OBJECT

diff --git a/src/main.cpp b/src/main.cpp
@@ -74,8 +74,14 @@ int main (int argc, char *argv[])
         kernel.end();
     try
     {
+
+#if BOOST_VERSION < 107400
+        boost::filesystem::copy_file(kernel.log_file_path,kernel.o_path / "CHM.log", boost::filesystem::copy_option::overwrite_if_exists);
+#else
         boost::filesystem::copy_file(kernel.log_file_path,kernel.o_path / "CHM.log", boost::filesystem::copy_options::overwrite_existing);
-    }
+#endif
+}
+
     catch(...)
     {
 

diff --git a/src/timeseries/timeseries.hpp b/src/timeseries/timeseries.hpp
@@ -35,6 +35,7 @@
 #include <boost/date_time/posix_time/posix_time.hpp> // for boost::posix
 
 #include <boost/variant.hpp>
+#include <boost/make_shared.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/utility.hpp>
-Original file line number
+Diff line change
@@ Expand Up / @@ -203,7 +203,6 @@ if(BUILD_WITH_CONAN) @@
     endif()
-    add_compile_definitions(SPDLOG_FMT_EXTERNAL)
     message("-- Final compile: ${CHM_BUILD_FLAGS}")
     add_library(CHMmath OBJECT
@@ Expand Down @@