more updates to build on ginsburg.

CMakeLists.txt

@@ -45,9 +45,13 @@ configure_file(config.h.in config.h)
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 include(CheckCXXCompilerFlag)
-if(DEFINED ENV{CI})
-    message(STATUS "CI environment detected. Set compilation flags targetting Westmere microarch.")
-    set(CMAKE_CXX_FLAGS "-O3 -march=znver3")
+IF(DEFINED ENV{CI})
+    if (APPLE)
+        set(CMAKE_CXX_FLAGS "-O3")
+    else()
+        message(STATUS "CI environment detected. Set compilation flags targetting Westmere microarch.")
+        set(CMAKE_CXX_FLAGS "-O3 -march=westmere")
+    endif()
 elseif(DEFINED ENV{CONDA_BUILD})
     message(STATUS "conda build environment detected. Let conda set compilation flags accordingly.")
     # set(CMAKE_CXX_FLAGS "-O3 -march=ivybridge -mfma -ffp-contract=fast")
@@ -64,6 +68,9 @@ else()
         set(CMAKE_CXX_FLAGS "-O3 -ffp-contract=fast")
     endif()
 endif()
+# Ensure all code used from Eigen does not have LGPL license:
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DEIGEN_MPL2_ONLY")
+message(STATUS "CMAKE_CXX_FLAGS are ${CMAKE_CXX_FLAGS}")
 
 if(DEFINED ENV{CONDA_PREFIX})
     include_directories($ENV{CONDA_PREFIX}/include)

src/simsoptpp/tracing_helpers.h

@@ -5,6 +5,8 @@
 #include <array>
 #include <vector>
 #include <tuple>
+#include <memory>
+#include <functional>
 
 using std::array;
 using std::shared_ptr;
@@ -229,4 +231,4 @@ bool check_stopping_criteria(RHS rhs, typename RHS::State y, int iter, vector<ar
         }
     }
     return stop;
-}
+}