MuonColliderSoft · pandreetto · Jul 5, 2024 · Feb 2, 2023 · Feb 3, 2023 · Feb 3, 2023
diff --git a/.github/workflows/key4hep.yml b/.github/workflows/key4hep.yml
@@ -0,0 +1,37 @@
+name: key4hep
+
+on: [push, pull_request]
+
+jobs:
+  linux:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        release: ["sw.hsf.org/key4hep",
+                  "sw-nightlies.hsf.org/key4hep"]
+    steps:
+    - uses: actions/checkout@v3
+    - uses: cvmfs-contrib/github-action-cvmfs@v3
+    - uses: aidasoft/run-lcg-view@v4
+      with:
+        container: centos7
+        view-path: /cvmfs/${{ matrix.release }}
+        run: |
+          mkdir build install
+          cd build
+          cmake -DCMAKE_CXX_STANDARD=20 \
+            -DBUILD_ROOTDICT=ON \
+            -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -Werror " \
+            -DCMAKE_INSTALL_PREFIX=../install \
+            ..
+          make -k
+          make install
+          ctest --output-on-failure
+          echo "::group::Test downstream build"
+          cd -
+          export CMAKE_PREFIX_PATH=$PWD/install:$CMAKE_PREFIX_PATH
+          cd tests/downstream-project-cmake-test
+          mkdir build && cd build
+          cmake .. -DCMAKE_CXX_STANDARD=20
+          make -k
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
@@ -14,7 +14,7 @@ jobs:
               "LCG_102/x86_64-centos7-clang12-opt",
               "LCG_102/x86_64-ubuntu2004-gcc9-opt"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: cvmfs-contrib/github-action-cvmfs@v3
     - uses: aidasoft/run-lcg-view@v4
       with:
@@ -24,10 +24,16 @@ jobs:
           cd build
           cmake -DCMAKE_CXX_STANDARD=17 \
             -DBUILD_ROOTDICT=ON \
-            -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" \
+            -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -Werror" \
             -DCMAKE_INSTALL_PREFIX=../install \
-            -DBUILD_F77_TESTJOBS=ON \
             ..
           make -k
           make install
           ctest --output-on-failure
+          echo "::group::Test downstream build"
+          cd -
+          export CMAKE_PREFIX_PATH=$PWD/install:$CMAKE_PREFIX_PATH
+          cd tests/downstream-project-cmake-test
+          mkdir build && cd build
+          cmake .. -DCMAKE_CXX_STANDARD=17
+          make -k
diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml
@@ -4,12 +4,12 @@ on: [push, pull_request]
 
 jobs:
   python-lint:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-latest
     strategy:
       matrix:
         LCG: ["LCG_98/x86_64-centos7-gcc10-opt"]
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install CVMFS
       run: |
         wget --no-check-certificate https://ecsft.cern.ch/dist/cvmfs/cvmfs-release/cvmfs-release-latest_all.deb

diff --git a/.github/workflows/python_bindings.yml b/.github/workflows/python_bindings.yml
@@ -9,7 +9,7 @@ jobs:
       fail-fast: false
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: cvmfs-contrib/github-action-cvmfs@v3
       - uses: aidasoft/run-lcg-view@v4
         with:
@@ -19,7 +19,7 @@ jobs:
             cd build
             cmake -DCMAKE_CXX_STANDARD=17 \
               -DBUILD_ROOTDICT=ON \
-              -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" \
+              -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always -Werror " \
               -DCMAKE_INSTALL_PREFIX=../install \
               -G Ninja \
               ..

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,18 +2,17 @@
 # cmake file for building LCIO
 # @author Frank Gaede, DESY
 # @author Jan Engels, DESY
-CMAKE_MINIMUM_REQUIRED( VERSION 2.8 FATAL_ERROR )
+CMAKE_MINIMUM_REQUIRED( VERSION 3.14 FATAL_ERROR )
 ########################################################
 
 
-
 # project name
 PROJECT( LCIO )
 include(GNUInstallDirs)
 
 # project version
 SET( LCIO_VERSION_MAJOR 2 )
-SET( LCIO_VERSION_MINOR 17 )
+SET( LCIO_VERSION_MINOR 22 )
 SET( LCIO_VERSION_PATCH 0 )
 
 ### set correct LCIO version in relevant files  ############################
@@ -166,12 +165,23 @@ eval $*
 
 ENDIF()
 
-# Deal with SIO
-FIND_PACKAGE( SIO QUIET )
+# Deal with SIO (we need at least 0.1 since there are no targets before)
+FIND_PACKAGE( SIO 0.1 QUIET )
 
 IF( NOT SIO_FOUND )
   MESSAGE( STATUS "SIO not found on your system. Using builtin sio" )
-  ADD_SUBDIRECTORY( sio )
+  include(FetchContent)
+  FetchContent_Declare(sio_extern
+  GIT_REPOSITORY https://github.com/iLCSoft/SIO.git
+  GIT_TAG v00-02
+  GIT_SHALLOW 1
+#  FIND_PACKAGE_ARGS
+)
+
+  FetchContent_MakeAvailable(sio_extern)
+
+  get_target_property(SIO_VERSION SIO::sio VERSION)
+  get_target_property(SIO_INCLUDE_DIRS SIO::sio INCLUDE_DIRECTORIES)
 ENDIF()
 
 MESSAGE( STATUS "Using SIO (${SIO_VERSION})" )
@@ -287,14 +297,6 @@ OPTION( BUILD_LCIO_EXAMPLES "Set to ON to build LCIO examples" ON )
 ADD_SUBDIRECTORY( ./src/cpp lcio )
 
 
-
-# fortran examples
-OPTION( BUILD_F77_TESTJOBS "Set to ON to build LCIO F77 testjobs" OFF )
-IF( BUILD_F77_TESTJOBS )
-    ADD_SUBDIRECTORY( ./src/f77 f77 )
-ENDIF()
-
-
 # directory containing lcio tests
 ADD_SUBDIRECTORY( ./tests )
 
@@ -325,3 +327,10 @@ MESSAGE( STATUS "" )
 GENERATE_PACKAGE_CONFIGURATION_FILES( LCIOConfig.cmake LCIOConfigVersion.cmake )
 
 INSTALL( FILES cmake/MacroCheckPackageLibs.cmake cmake/MacroCheckPackageVersion.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake)
+
+install(EXPORT ${PROJECT_NAME}Targets
+  NAMESPACE ${PROJECT_NAME}::
+  FILE "${PROJECT_NAME}Targets.cmake"
+  DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/"
+  )
+
diff --git a/README.md b/README.md
@@ -11,8 +11,7 @@ LCIO ( **L**inear **C**ollider **I/O** ) is a persistency framework and event da
 ## Introduction
 
 LCIO is intended to be used in both simulation studies and analysis frameworks. Its light weight and portability makes it also suitable for use in detector R&D
-testbeam applications. It provides a C++ and optionally a Java implementation with a common interface (API) - a Fortran interface to the C++ implementation also exists,
-if built with ROOT, Python bindings are available .
+testbeam applications. It provides a C++ and optionally a Java implementation with a common interface (API) - if built with ROOT, Python bindings are available .
 
 Using a common persistency format and event data model allows to easily share results and compare reconstruction algorithms.
 LCIO is used by almost all groups involved in linear collider detector studies and thus has become a de facto standard.

diff --git a/cmake/FindCLHEP.cmake b/cmake/FindCLHEP.cmake
diff --git a/cmake/LCIOConfig.cmake.in b/cmake/LCIOConfig.cmake.in
@@ -67,6 +67,12 @@ CHECK_PACKAGE_LIBS( LCIO lcio @CHECK_PACKAGE_SIO_LIBRARY@ )
 ## ---------------------------------------------------------------
 
 
+include(CMakeFindDependencyMacro)
+find_dependency(SIO @SIO_VERSION@)
+
+# Include the targets file to create the imported targets that a client can link
+# to or execute
+include("${CMAKE_CURRENT_LIST_DIR}/LCIOTargets.cmake")
 
 
 # ---------- final checking ---------------------------------------------------

diff --git a/cmake/MacroGeneratePackageConfigFiles.cmake b/cmake/MacroGeneratePackageConfigFiles.cmake
@@ -9,7 +9,7 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
                 CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake/${arg}.in"
                                 "${PROJECT_BINARY_DIR}/${arg}" @ONLY
                 )
-                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION . )
+                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} )
                 #IF( EXISTS "${_current_dir}/MacroCheckPackageLibs.cmake" )
                 #    INSTALL( FILES "${_current_dir}/MacroCheckPackageLibs.cmake" DESTINATION cmake )
                 #ENDIF()
@@ -26,7 +26,7 @@ MACRO( GENERATE_PACKAGE_CONFIGURATION_FILES )
                 CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/cmake/${arg}.in"
                                 "${PROJECT_BINARY_DIR}/${arg}" @ONLY
                 )
-                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION . )
+                INSTALL( FILES "${PROJECT_BINARY_DIR}/${arg}" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} )
                 #IF( EXISTS "${_current_dir}/MacroCheckPackageVersion.cmake" )
                 #    INSTALL( FILES "${_current_dir}/MacroCheckPackageVersion.cmake" DESTINATION cmake )
                 #ENDIF()

diff --git a/cmake/ilcsoft_build_32bit_compatible.cmake b/cmake/ilcsoft_build_32bit_compatible.cmake
diff --git a/cmake/ilcsoft_default_settings.cmake b/cmake/ilcsoft_default_settings.cmake
@@ -21,7 +21,6 @@ INCLUDE( ilcsoft_default_library_versioning )
 INCLUDE( ilcsoft_default_build_output_directories )
 INCLUDE( ilcsoft_default_rpath_settings )
 INCLUDE( ilcsoft_default_cxx_flags )
-#INCLUDE( ilcsoft_build_32bit_compatible )
 
 
 # uninstall target may only be created once per project

diff --git a/cmake/ilcsoft_default_uninstall_target.cmake b/cmake/ilcsoft_default_uninstall_target.cmake
@@ -7,7 +7,9 @@ IF( EXISTS "${_current_dir}/cmake_uninstall.cmake.in" )
                     "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" @ONLY )
 
     # add uninstall target
-    ADD_CUSTOM_TARGET( uninstall "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" )
+    if (NOT TARGET uninstall)
+        ADD_CUSTOM_TARGET( uninstall "${CMAKE_COMMAND}" -P "${PROJECT_BINARY_DIR}/cmake_uninstall.cmake" )
+    endif()
 
 ENDIF( EXISTS "${_current_dir}/cmake_uninstall.cmake.in" )