Merge branch 'develop'

# Conflicts: # Splines.prj
ebertolazzi · Nov 19, 2023 · 7362546 · 7362546
1 parent dbf43fc
commit 7362546
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -29,8 +29,8 @@ if( UTILS_BUILD_SHARED )
   utils_artifacts_suffix(ARTIFACTS_DYNAMIC_SUFFIX FALSE)
 endif()
 
-if ( APPLE )
-  set( CMAKE_OSX_ARCHITECTURES arm64;x86_64 )
+if( EXISTS "../CMakeLists-customize.txt" )
+  include(../CMakeLists-customize.txt)
 endif()
 
 message( STATUS "Compiler used: ${CMAKE_CXX_COMPILER_ID}" )

diff --git a/submodules/GenericContainer b/submodules/GenericContainer
diff --git a/submodules/Utils b/submodules/Utils
diff --git a/submodules/quarticRootsFlocke b/submodules/quarticRootsFlocke
+7 −1		examples/example10.cc
+64 −50		include/GenericContainer/GenericContainer.hh
+347 −85		src/GenericContainer.cc
+2 −2		src/GenericContainerCinterface.cc
+8 −8		src/GenericContainerSerialize.cc
+4 −4		src/GenericContainerTables.cc
+24 −24		src_json_interface/GenericContainerJson.cc
+12 −12		src_matlab_interface/GenericContainerMatlabInterface.cc