Merge pull request #34 from DUNE/dbarrow257/feature/Core_v1.3.4

Feat: Update to core v1.3.4
DUNE · Jan 24, 2025 · 9a61d93 · 9a61d93
2 parents 50dae1c + aacd5f0
commit 9a61d93
Show file tree

Hide file tree

Showing 22 changed files with 175 additions and 1,324 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,3 @@
-set(CMAKE_VERBOSE_MAKEFILE ON)
-
 # CMake version check
 cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
 
@@ -9,8 +7,6 @@ SET(MaCh3DUNE_VERSION 1.0.0)
 project(MaCh3DUNE VERSION ${MaCh3DUNE_VERSION} LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD_REQUIRED True)
 
-option(MaCh3_DUNE_USE_SRProxy "Whether to build proxy classes for Standard Record objects" OFF)
-
 # Changes default install path to be a subdirectory of the build dir.
 # Can set build dir at configure time with -DCMAKE_INSTALL_PREFIX=/install/path
 if(CMAKE_INSTALL_PREFIX STREQUAL "" OR CMAKE_INSTALL_PREFIX STREQUAL
@@ -27,20 +23,31 @@ find_program(CMAKE_CXX_COMPILER NAMES $ENV{CXX} g++ PATHS ENV PATH NO_DEFAULT_PA
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/Modules)
 
 message("CMAKE SOURCE_DIR IS ${CMAKE_SOURCE_DIR}")
+
 ################################################################################
 #                            Check Dependencies
 ################################################################################
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/cmake/Modules)
-include(CPM)
+
+#=================== CPM
+
+# download CPM.cmake
+file(
+  DOWNLOAD
+  https://github.com/cpm-cmake/CPM.cmake/releases/download/v0.40.2/CPM.cmake
+  ${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake
+)
+include(${CMAKE_CURRENT_BINARY_DIR}/cmake/CPM.cmake)
 
 CPMFindPackage(
       NAME CMakeModules
-      GIT_TAG v0.2.3
+      GIT_TAG stable
       GITHUB_REPOSITORY NuHepMC/CMakeModules
       DOWNLOAD_ONLY
   )
 include(${CMakeModules_SOURCE_DIR}/NuHepMCModules.cmake)
 
+#=================== ROOT
 include(ROOT)
 
 if(NOT TARGET ROOT::ROOT)
@@ -51,7 +58,9 @@ if(DEFINED ROOT_CXX_STANDARD AND ROOT_CXX_STANDARD GREATER CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD ${ROOT_CXX_STANDARD})
 endif()
 
-############################  DUNEAnaObj  ####################################
+#=================== DUNEAnaObj
+
+option(MaCh3_DUNE_USE_SRProxy "Whether to build proxy classes for Standard Record objects" OFF)
 
 if(MaCh3_DUNE_USE_SRProxy)
   find_package(duneanaobj)
@@ -111,18 +120,48 @@ endif()
 
 ##################################  MaCh3  ######################################
 #If MaCh3 was sourced find it, otherwise use CPM
-find_package(MaCh3)
+SET(MaCh3_FOUND FALSE)
+find_package(MaCh3 1.3.4 EXACT QUIET)
 
 if(NOT MaCh3_FOUND)
-  CPMFindPackage(
+  cmessage(STATUS "Didn't find MaCh3, attempting to use built in MaCh3")
+
+  if(NOT DEFINED USE_CPU)
+    set(USE_CPU FALSE)
+  endif()
+
+  if(NOT DEFINED DEBUG_ENABLED)
+    set(DEBUG_ENABLED FALSE)
+  endif()
+
+  if(NOT DEFINED MULTITHREAD_ENABLED)
+    set(MULTITHREAD_ENABLED TRUE)
+  endif()
+
+  # Options list construction
+  set(MaCh3_OPTIONS
+      "USE_CPU ${USE_CPU}"
+      "MaCh3_DEBUG_ENABLED ${DEBUG_ENABLED}"
+      "MaCh3_MULTITHREAD_ENABLED ${MULTITHREAD_ENABLED}"
+  )
+
+  # Add LOG_LEVEL if defined
+  if (LOG_LEVEL)
+      list(APPEND MaCh3_OPTIONS "LOG_LEVEL ${LOG_LEVEL}")
+  endif()
+
+  CPMAddPackage(
       NAME MaCh3
-      GIT_TAG "v1.2.0_alpha"
+      GIT_TAG "v1.3.4"
       GITHUB_REPOSITORY mach3-software/MaCh3
   )
 else()
   ##KS: This ensure that all executables that are in core will be moved
   FILE(GLOB MaCh3Exe $ENV{MaCh3_ROOT}/Diagnostics/*)
   FILE(COPY ${MaCh3Exe} DESTINATION ${CMAKE_BINARY_DIR}/Diagnostics/)
+
+  FILE(GLOB MaCh3Exe $ENV{MaCh3_ROOT}/plotting/*)
+  FILE(COPY ${MaCh3Exe} DESTINATION ${CMAKE_BINARY_DIR}/plotting/)
 endif()
 
 if(NOT TARGET MaCh3::All)
@@ -131,14 +170,38 @@ endif()
 
 ############################  C++ Compiler  ####################################
 if (NOT DEFINED CMAKE_CXX_STANDARD OR "${CMAKE_CXX_STANDARD} " STREQUAL " ")
-  SET(CMAKE_CXX_STANDARD 11)
+  SET(CMAKE_CXX_STANDARD 14)
 endif()
 
 if(DEFINED ROOT_CXX_STANDARD AND ROOT_CXX_STANDARD GREATER CMAKE_CXX_STANDARD)
   set(CMAKE_CXX_STANDARD ${ROOT_CXX_STANDARD})
 endif()
 cmessage(STATUS "CMAKE CXX Standard: ${CMAKE_CXX_STANDARD}")
 
+############################  FLAGS  ####################################
+add_library(DUNEMaCh3Warnings INTERFACE)
+
+target_compile_options(DUNEMaCh3Warnings INTERFACE
+  -Wextra                 # Enable extra warning flags
+  -Wall                   # Enable all standard warning flags
+  -Wshadow                # Warn when a variable declaration shadows one from an outer scope
+  -Wuninitialized         # Warn about uninitialized variables
+  -Wnon-virtual-dtor      # Warn when a class with virtual functions has a non-virtual destructor
+  -Woverloaded-virtual    # Warn when a function declaration hides a virtual function from a base class
+  -Wformat=2              # Warn on security issues around functions that format output (ie printf)
+  -Wunused                # Warn on anything being unused
+  -Wredundant-decls       # Warn about multiple declarations of the same entity. Useful for code cleanup.
+  -Wstrict-aliasing=2     # Helps detect potential aliasing issues that could lead to undefined behavior.
+  -Wuseless-cast          # Warn if you perform a cast to the same type (only in GCC >= 4.8)
+  -Wnull-dereference      # Warn if a null dereference is detected (only in GCC >= 6.0)
+  -Wold-style-cast        # Warn for c-style casts
+  -Wconversion            # Warn on type conversions that may lose data
+  -Wformat-security       # Warn on functions that are potentially insecure for formatting
+  -Walloca                # Warn if `alloca` is used, as it can lead to stack overflows
+  #-Wswitch-enum           # Warn if a `switch` statement on an enum does not cover all values
+  #-Wfloat-equal          # Warn if floating-point values are compared directly
+  #-Wpadded               # Warn when padding is added to a structure or class for alignment
+)
 
 ################################# Features ##################################
 
@@ -165,9 +228,7 @@ endif()
 ################################# Build MaCh3 ##################################
 add_library(MaCh3DUNECompilerOptions INTERFACE)
 set_target_properties(MaCh3DUNECompilerOptions PROPERTIES EXPORT_NAME CompilerOptions)
-if(PSYCHE_FOUND)
-  target_compile_definitions(MaCh3DUNECompilerOptions INTERFACE PSYCHESETUP)
-endif()
+
 target_include_directories(MaCh3DUNECompilerOptions
   INTERFACE
     $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/src>
@@ -184,7 +245,7 @@ add_subdirectory(src)
 
 add_library(MaCh3DUNEAll INTERFACE)
 set_target_properties(MaCh3DUNEAll PROPERTIES EXPORT_NAME All)
-target_link_libraries(MaCh3DUNEAll INTERFACE SamplePDFDUNE MaCh3DUNECompilerOptions)
+target_link_libraries(MaCh3DUNEAll INTERFACE SamplePDFDUNE splinesDUNE MaCh3DUNECompilerOptions)
 add_library(MaCh3DUNE::All ALIAS MaCh3DUNEAll)
 
 install(TARGETS MaCh3DUNEAll
@@ -203,19 +264,12 @@ install(DIRECTORY inputs DESTINATION ${CMAKE_BINARY_DIR})
 install(DIRECTORY configs DESTINATION ${CMAKE_BINARY_DIR})
 install(DIRECTORY utils DESTINATION ${CMAKE_BINARY_DIR})
 
-set(export_destinations
-    ${CMAKE_INSTALL_PREFIX}/lib/cmake/
-    ${CMAKE_INSTALL_PREFIX}/
+install(EXPORT mach3dune-targets
+        FILE MaCh3DUNETargets.cmake
+        NAMESPACE MaCh3DUNE::
+        DESTINATION ${CMAKE_INSTALL_PREFIX}/
 )
 
-foreach(dest ${export_destinations})
-  install(EXPORT mach3dune-targets
-          FILE MaCh3DUNETargets.cmake
-          NAMESPACE MaCh3DUNE::
-          DESTINATION ${dest}
-  )
-endforeach()
-
 include(CMakePackageConfigHelpers)
 configure_package_config_file(
   ${CMAKE_CURRENT_LIST_DIR}/cmake/Templates/MaCh3DUNEConfig.cmake.in ${CMAKE_BINARY_DIR}/MaCh3DUNEConfig.cmake