Update build system with cmake-init-0.41.0

Author: rlalik

.github/workflows/ci.yml

@@ -11,7 +11,7 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
     - uses: actions/checkout@v4
@@ -23,7 +23,7 @@ jobs:
       run: pip3 install codespell
 
     - name: Lint
-      run: cmake -D FORMAT_COMMAND=clang-format-14 -P cmake/lint.cmake
+      run: cmake -D FORMAT_COMMAND=clang-format-18 -P cmake/lint.cmake
 
     - name: Spell check
       if: always()
@@ -32,7 +32,7 @@ jobs:
   coverage:
     needs: [lint]
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     # To enable coverage, delete the last line from the conditional below and
     # edit the "<name>" placeholder to your GitHub name.
@@ -70,9 +70,9 @@ jobs:
   sanitize:
     needs: [lint]
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
-    env: { CXX: clang++-14 }
+    env: { CXX: clang++-18 }
 
     steps:
     - uses: actions/checkout@v4
@@ -101,7 +101,7 @@ jobs:
 
     strategy:
       matrix:
-        os: [macos-14, ubuntu-22.04, windows-2022]
+        os: [macos-14, ubuntu-24.04, windows-2022]
 
         type: [shared, static]
 
@@ -115,13 +115,13 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Install static analyzers
-      if: matrix.os == 'ubuntu-22.04'
+      if: matrix.os == 'ubuntu-24.04'
       run: >-
-        sudo apt-get install clang-tidy-14 cppcheck -y -q
+        sudo apt-get install clang-tidy-18 cppcheck -y -q
 
         sudo update-alternatives --install
         /usr/bin/clang-tidy clang-tidy
-        /usr/bin/clang-tidy-14 140
+        /usr/bin/clang-tidy-18 180
 
     - name: Setup MultiToolTask
       if: matrix.os == 'windows-2022'
@@ -152,7 +152,7 @@ jobs:
     # Deploy docs only when builds succeed
     needs: [sanitize, test]
 
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     # To enable, first you have to create an orphaned gh-pages branch:
     #

CMakeLists.txt

@@ -4,7 +4,7 @@ include(cmake/prelude.cmake)
 
 project(
     HelloFitty
-    VERSION 0.12.1
+    VERSION 0.20.0
     DESCRIPTION "Hello Fitty - a versatile histogram fitting tool for ROOT-based projects."
     HOMEPAGE_URL "https://github.com/rlalik/HelloFitty"
     LANGUAGES CXX
@@ -15,12 +15,20 @@ include(cmake/variables.cmake)
 include(cmake/find_or_fetch_package.cmake)
 
 # find ROOT
-#list(APPEND CMAKE_PREFIX_PATH $ENV{ROOTSYS})
 find_package(ROOT QUIET REQUIRED COMPONENTS Core Hist)
 
-find_or_fetch_package(fmt https://github.com/fmtlib/fmt GIT_TAG 11.0.2 VERSION 11.0.2)
+# FMT
+find_or_fetch_package(fmt https://github.com/fmtlib/fmt GIT_TAG 11.1.2 VERSION 11.1.2)
+if (fmt_FETCHED)
+  set(FMT_TARGET $<BUILD_INTERFACE:fmt::fmt-header-only>)
+else()
+  set(FMT_TARGET fmt::fmt)
+endif()
 
 # ---- Declare library ----
+
+configure_file(config.h.in inc/hellofitty_config.h)
+
 add_library(
     HelloFitty
     source/hellofitty.cpp
@@ -33,15 +41,10 @@ add_library(
 )
 add_library(HelloFitty::HelloFitty ALIAS HelloFitty)
 
-target_link_libraries(HelloFitty PUBLIC ROOT::Core ROOT::Hist)
-if (fmt_FETCHED)
-  set(FMT_TARGET $<BUILD_INTERFACE:fmt::fmt-header-only>)
-else()
-  set(FMT_TARGET fmt::fmt)
-endif()
-target_link_libraries(HelloFitty PRIVATE ${FMT_TARGET})
-
-configure_file(config.h.in hellofitty_config.h)
+target_link_libraries(HelloFitty
+    PUBLIC ROOT::Core ROOT::Hist
+    PRIVATE ${FMT_TARGET}
+)
 
 include(GenerateExportHeader)
 generate_export_header(
@@ -68,24 +71,24 @@ set_target_properties(
 target_include_directories(
     HelloFitty ${warning_guard}
     PUBLIC
-    "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
-    "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/inc>"
+    "\$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
+    "\$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/inc>"
 )
 
 target_include_directories(
     HelloFitty SYSTEM
     PUBLIC
-    "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/export>"
-    "$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>"
+    "\$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/export>"
+    "\$<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/inc>"
 )
 
 option(BUILD_DICTIONARY "Build ROOT dictionary." OFF)
 if (BUILD_DICTIONARY)
-  # cmake-format: off
-  root_generate_dictionary(G__HelloFitty_cc hellofitty.hpp
-    MODULE HelloFitty
-    LINKDEF inc/LinkDef.h)
-  # cmake-format: on
+    # cmake-format: off
+    root_generate_dictionary(G__HelloFitty_cc hellofitty.hpp
+        MODULE HelloFitty
+        LINKDEF inc/LinkDef.h)
+    # cmake-format: on
 endif()
 
 # target_compile_features(HelloFitty PUBLIC cxx_std_11)

CMakePresets.json

@@ -2,7 +2,7 @@
   "version": 3,
   "cmakeMinimumRequired": {
     "major": 3,
-    "minor": 12,
+    "minor": 14,
     "patch": 0
   },
   "configurePresets": [
@@ -109,11 +109,13 @@
     },
     {
       "name": "ci-linux",
+      "description": "Includes fortification with the CMake default release flags",
       "inherits": ["flags-gcc-clang", "ci-std"],
       "generator": "Unix Makefiles",
       "hidden": true,
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
+        "CMAKE_BUILD_TYPE": "Release",
+        "CMAKE_CXX_FLAGS_RELEASE": "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3 -O3 -DNDEBUG"
       }
     },
     {

CMakeUserPresets.json

@@ -2,7 +2,7 @@
   "version": 3,
   "cmakeMinimumRequired": {
     "major": 3,
-    "minor": 12,
+    "minor": 14,
     "patch": 0
   },
   "configurePresets": [
@@ -72,7 +72,7 @@
       "name": "dev",
       "configurePreset": "dev",
       "configuration": "Debug",
-      "jobs": 4
+      "jobs": 32
     }
   ],
   "testPresets": [
@@ -84,7 +84,7 @@
         "outputOnFailure": true
       },
       "execution": {
-        "jobs": 4,
+        "jobs": 32,
         "noTestsAction": "error"
       }
     }

example/CMakeLists.txt

@@ -1,22 +1,30 @@
-# set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_INSTALL_PREFIX}/lib/CMake)
-# set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} ${CMAKE_INSTALL_PREFIX}/lib/CMake)
+cmake_minimum_required(VERSION 3.14)
 
-# include(find_or_fetch_package)
-# find_or_fetch_package(RootTools https://github.com/rlalik/RootTools GIT_TAG
-                      # master)
+project(HelloFittyExamples CXX)
 
-# set(HAS_ROOTTOOLS ${RootTools_FOUND})
+include(../cmake/project-is-top-level.cmake)
+include(../cmake/folders.cmake)
 
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+if(PROJECT_IS_TOP_LEVEL)
+  find_package(HelloFitty REQUIRED)
+endif()
 
-add_executable(example1 example1.cpp)
-target_include_directories(example1 PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(example1 HelloFitty::HelloFitty ${FMT_TARGET})
+add_custom_target(run-examples)
 
-add_executable(example2 example2.cpp)
-target_include_directories(example2 PRIVATE ${CMAKE_BINARY_DIR})
-target_link_libraries(example2 HelloFitty::HelloFitty ${FMT_TARGET})
+function(add_example NAME)
+  add_executable("${NAME}" "${NAME}.cpp")
+  target_link_libraries("${NAME}" PRIVATE HelloFitty::HelloFitty ${FMT_TARGET})
+  target_compile_features("${NAME}" PRIVATE cxx_std_17)
+  add_custom_target("run_${NAME}" COMMAND "${NAME}" VERBATIM)
+  add_dependencies("run_${NAME}" "${NAME}")
+  add_dependencies(run-examples "run_${NAME}")
+endfunction()
+
+add_example(example1)
+add_example(example2)
 
 if(RootTools_FOUND)
   # target_link_libraries(example2 RT::RootTools)
 endif(RootTools_FOUND)
+
+add_folders(Example)

test/CMakeLists.txt

@@ -1,18 +1,19 @@
-include(../cmake/find_or_fetch_package.cmake)
+cmake_minimum_required(VERSION 3.14)
 
-set(INSTALL_GTEST OFF)
-find_or_fetch_package(GTest https://github.com/google/googletest GIT_TAG release-1.11.0)
+project(HelloFittyTests LANGUAGES CXX)
 
-set(tests_SRCS tests_param.cpp
-               tests_entry.cpp
-               tests_parser_v1.cpp
-               tests_parser_v2.cpp
-               tests_fitter.cpp
-               tests_hellofitty_tools.cpp)
+include(../cmake/project-is-top-level.cmake)
+include(../cmake/folders.cmake)
 
-add_executable(gtests ${tests_SRCS})
+# ---- Dependencies ----
+
+if(PROJECT_IS_TOP_LEVEL)
+  find_package(HelloFitty REQUIRED)
+  enable_testing()
+endif()
 
-target_include_directories(gtests PRIVATE ${CMAKE_BINARY_DIR})
+set(INSTALL_GTEST OFF)
+find_or_fetch_package(GTest https://github.com/google/googletest GIT_TAG release-1.11.0)
 
 if(TARGET GTest::gtest_main)
   # new cmake provided
@@ -22,9 +23,30 @@ else()
   set(GTEST_TRG gtest gtest_main)
 endif()
 
-target_link_libraries(gtests PRIVATE HelloFitty::HelloFitty ROOT::Core ${GTEST_TRG} ${FMT_TARGET})
+# ---- Tests ----
+
+set(tests_SRCS tests_param.cpp
+               tests_entry.cpp
+               tests_parser_v1.cpp
+               tests_parser_v2.cpp
+               tests_fitter.cpp
+               tests_hellofitty_tools.cpp)
+
+add_executable(gtests ${tests_SRCS})
+target_link_libraries(gtests
+    PRIVATE
+        HelloFitty::HelloFitty
+        ROOT::Core
+        ${GTEST_TRG}
+        ${FMT_TARGET}
+)
+
 if(ENABLE_ADVANCE_TOOLS)
   target_code_coverage(gtests ALL)
 endif()
 
 gtest_discover_tests(gtests)
+
+# ---- End-of-file commands ----
+
+add_folders(Test)