Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package clhep for openSUSE:Factory checked in at 2025-11-12 21:16:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/clhep (Old) and /work/SRC/openSUSE:Factory/.clhep.new.1980 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "clhep" Wed Nov 12 21:16:22 2025 rev:3 rq:1317351 version:2.4.7.2 Changes: -------- --- /work/SRC/openSUSE:Factory/clhep/clhep.changes 2024-01-08 23:46:51.585796857 +0100 +++ /work/SRC/openSUSE:Factory/.clhep.new.1980/clhep.changes 2025-11-12 21:17:07.209006753 +0100 @@ -1,0 +2,10 @@ +Sun Nov 9 13:03:26 UTC 2025 - Atri Bhattacharya <[email protected]> + +- Update to version 2.4.7.2: + * support for -std=c++23 + * add CLHEP_BUILD_STATIC_LIBS option (ON by default) +- Drop clhep-respect-build_static_libs.patch: no longer needed; + use upstream configure option CLHEP_BUILD_STATIC_LIBS=OFF + instead. + +------------------------------------------------------------------- Old: ---- clhep-2_4_7_1.tar.bz2 clhep-respect-build_static_libs.patch New: ---- clhep-2_4_7_2.tar.bz2 ----------(Old B)---------- Old: * add CLHEP_BUILD_STATIC_LIBS option (ON by default) - Drop clhep-respect-build_static_libs.patch: no longer needed; use upstream configure option CLHEP_BUILD_STATIC_LIBS=OFF ----------(Old E)---------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ clhep.spec ++++++ --- /var/tmp/diff_new_pack.gabJXi/_old 2025-11-12 21:17:07.957038108 +0100 +++ /var/tmp/diff_new_pack.gabJXi/_new 2025-11-12 21:17:07.957038108 +0100 @@ -1,7 +1,7 @@ # # spec file for package clhep # -# Copyright (c) 2024 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,23 +16,20 @@ # -%define tagname 2_4_7_1 +%define tagname 2_4_7_2 %define shlib libCLHEP-%{tagname} -%define _ver %(echo %{tagname} | tr '_' '.') # clhep requires a buildir which is not a subdirectory of the sourcedir %global __builddir %{_builddir}/%{name}_build Name: clhep -Version: 2.4.7.1 +Version: 2.4.7.2 Release: 0 Summary: A class library for high energy physics License: GPL-3.0-only OR LGPL-3.0-only Group: Development/Libraries/C and C++ URL: https://proj-clhep.web.cern.ch/proj-clhep/ Source0: https://gitlab.cern.ch/CLHEP/CLHEP/-/archive/CLHEP_%{tagname}/CLHEP-CLHEP_%{tagname}.tar.bz2#/clhep-%{tagname}.tar.bz2 -# PATCH-FIX-UPSTREAM clhep-respect-build_static_libs.patch [email protected] -- Don't build or install static libs if BUILD_STATIC_LIBS is OFF Source99: clhep.macros -Patch1: clhep-respect-build_static_libs.patch # PATCH-FIX-UPSTREAM clhep-docdir.patch [email protected] -- Allow configuring docdir from cmake command Patch2: clhep-docdir.patch BuildRequires: cmake @@ -143,6 +140,7 @@ %clhep_subpkg_devel -n Vector clhep-Units-devel # /Section + %prep %autosetup -n CLHEP-CLHEP_%{tagname} -p1 chmod -x README.md ChangeLog @@ -153,6 +151,7 @@ %cmake \ -DCLHEP_BUILD_DOCS:BOOL=ON \ + -DCLHEP_BUILD_STATIC_LIBS:BOOL=OFF \ -DCLHEP_DOCDIR:PATH=%{_docdir}/%{name}/ \ %ifarch x86_64 ppc64 ppc64le aarch64 riscv64 -DLIB_SUFFIX=64 \ ++++++ clhep-2_4_7_1.tar.bz2 -> clhep-2_4_7_2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/CMakeLists.txt new/CLHEP-CLHEP_2_4_7_2/CMakeLists.txt --- old/CLHEP-CLHEP_2_4_7_1/CMakeLists.txt 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/CMakeLists.txt 2025-09-10 18:29:55.000000000 +0200 @@ -35,7 +35,7 @@ endif() # Project setup -project(CLHEP VERSION 2.4.7.1) +project(CLHEP VERSION 2.4.7.2) # - needed for (temporary) back compatibility set(VERSION ${PROJECT_VERSION}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/ChangeLog new/CLHEP-CLHEP_2_4_7_2/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,13 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== + +2025-09-10 L. Garren + +* support for -std=c++23 +* add CLHEP_BUILD_STATIC_LIBS option (ON by default) + +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Evaluator/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Evaluator/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Evaluator/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Evaluator/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Exceptions/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Exceptions/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Exceptions/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Exceptions/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Fields/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Fields/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Fields/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Fields/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/GenericFunctions/ChangeLog new/CLHEP-CLHEP_2_4_7_2/GenericFunctions/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/GenericFunctions/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/GenericFunctions/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Geometry/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Geometry/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Geometry/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Geometry/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Matrix/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Matrix/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Matrix/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Matrix/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Random/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Random/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Random/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Random/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/RandomObjects/ChangeLog new/CLHEP-CLHEP_2_4_7_2/RandomObjects/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/RandomObjects/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/RandomObjects/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Units/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Units/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Units/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Units/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Utility/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Utility/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Utility/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Utility/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/Vector/ChangeLog new/CLHEP-CLHEP_2_4_7_2/Vector/ChangeLog --- old/CLHEP-CLHEP_2_4_7_1/Vector/ChangeLog 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/Vector/ChangeLog 2025-09-10 18:29:55.000000000 +0200 @@ -1,4 +1,7 @@ ============================== +10.09.25 Release CLHEP-2.4.7.2 +============================== +============================== 12.10.23 Release CLHEP-2.4.7.1 ============================== ============================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepBuildLibrary.cmake new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepBuildLibrary.cmake --- old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepBuildLibrary.cmake 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepBuildLibrary.cmake 2025-09-10 18:29:55.000000000 +0200 @@ -20,45 +20,52 @@ # check for dependencies set( package_library_list ) - set(package_library_list_static) + set(package_library_listS) if( ${PACKAGE}_DEPS ) foreach ( dep ${${PACKAGE}_DEPS} ) ##message( STATUS "clhep_build_library ${package} will use ${dep}") list(APPEND package_library_list ${dep}) - list(APPEND package_library_list_static ${dep}S) + list(APPEND package_library_listS ${dep}S) endforeach() endif() - # Add the libraries and set properties - ADD_LIBRARY(${package} SHARED ${CLHEP_${package}_SOURCES}) - ADD_LIBRARY(${package}S STATIC ${CLHEP_${package}_SOURCES}) - SET_TARGET_PROPERTIES (${package} - PROPERTIES - OUTPUT_NAME CLHEP-${package}-${VERSION} - ) - SET_TARGET_PROPERTIES(${package}S + function(make_library package suffix type) + ADD_LIBRARY(${package}${suffix} ${type} ${CLHEP_${package}_SOURCES}) + SET_TARGET_PROPERTIES(${package}${suffix} PROPERTIES OUTPUT_NAME CLHEP-${package}-${VERSION} - ) + ) + # Do not add -Dname_EXPORTS to the command-line when building files in this + # target. Doing so is actively harmful for the modules build because it + # creates extra module variants, and not useful because we don't use these + # macros. + SET_TARGET_PROPERTIES(${package}${suffix} PROPERTIES DEFINE_SYMBOL "") + target_link_libraries(${package}${suffix} ${package_library_list${suffix}} ) + + endfunction() - # Do not add -Dname_EXPORTS to the command-line when building files in this - # target. Doing so is actively harmful for the modules build because it - # creates extra module variants, and not useful because we don't use these - # macros. - SET_TARGET_PROPERTIES(${package} PROPERTIES DEFINE_SYMBOL "") - SET_TARGET_PROPERTIES(${package}S PROPERTIES DEFINE_SYMBOL "") + # Add the libraries and set properties + make_library(${package} "" SHARED) + if (CLHEP_BUILD_STATIC_LIBS) + make_library(${package} "S" STATIC) + endif() - target_link_libraries(${package} ${package_library_list} ) - target_link_libraries(${package}S ${package_library_list_static} ) + set(CLHEP_library_targets) + list(APPEND CLHEP_library_targets ${package}) + if (CLHEP_BUILD_STATIC_LIBS) + list(APPEND CLHEP_library_targets ${package}S) + endif() # Install the libraries - INSTALL (TARGETS ${package} ${package}S - EXPORT CLHEPLibraryDepends - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - INCLUDES DESTINATION include - ) + INSTALL (TARGETS ${CLHEP_library_targets} + EXPORT CLHEPLibraryDepends + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} + INCLUDES DESTINATION include + ) + + endmacro(clhep_build_library) macro(clhep_build_libclhep ) @@ -69,48 +76,63 @@ endforeach() ##message( STATUS "clheplib source list ${clhep_sources}" ) - ADD_LIBRARY (CLHEP SHARED ${clhep_sources}) - ADD_LIBRARY (CLHEPS STATIC ${clhep_sources}) + function(make_clhep suffix type ) + ADD_LIBRARY (CLHEP${suffix} ${type} ${clhep_sources}) - SET_TARGET_PROPERTIES(CLHEP - PROPERTIES - OUTPUT_NAME CLHEP-${VERSION} - ) - SET_TARGET_PROPERTIES(CLHEPS + SET_TARGET_PROPERTIES(CLHEP${suffix} PROPERTIES OUTPUT_NAME CLHEP-${VERSION} - ) - # Do not add -Dname_EXPORTS to the command-line when building files in this - # target. Doing so is actively harmful for the modules build because it - # creates extra module variants, and not useful because we don't use these - # macros. - SET_TARGET_PROPERTIES(CLHEP PROPERTIES DEFINE_SYMBOL "") - SET_TARGET_PROPERTIES(CLHEPS PROPERTIES DEFINE_SYMBOL "") + ) + + # Do not add -Dname_EXPORTS to the command-line when building files in this + # target. Doing so is actively harmful for the modules build because it + # creates extra module variants, and not useful because we don't use these + # macros. + SET_TARGET_PROPERTIES(CLHEP${suffix} PROPERTIES DEFINE_SYMBOL "") + + endfunction() + + make_clhep("" SHARED) + if (CLHEP_BUILD_STATIC_LIBS) + make_clhep("S" STATIC) + endif() + + set(CLHEP_targets) + list(APPEND CLHEP_targets CLHEP) + if (CLHEP_BUILD_STATIC_LIBS) + list(APPEND CLHEP_targets CLHEPS) + endif() # export creates library dependency files for CLHEPConfig.cmake - INSTALL(TARGETS CLHEP CLHEPS - EXPORT CLHEPLibraryDepends - RUNTIME DESTINATION bin - LIBRARY DESTINATION lib${LIB_SUFFIX} - ARCHIVE DESTINATION lib${LIB_SUFFIX} - INCLUDES DESTINATION include - ) + INSTALL(TARGETS ${CLHEP_targets} + EXPORT CLHEPLibraryDepends + RUNTIME DESTINATION bin + LIBRARY DESTINATION lib${LIB_SUFFIX} + ARCHIVE DESTINATION lib${LIB_SUFFIX} + INCLUDES DESTINATION include + ) if( ${CMAKE_SYSTEM_NAME} MATCHES "Windows" ) # copy + if (CLHEP_BUILD_STATIC_LIBS) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" ) + endif() file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E copy ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin\" )" ) else() # create the symbolic links + if (CLHEP_BUILD_STATIC_LIBS) file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP${CMAKE_STATIC_LIBRARY_SUFFIX} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" ) + endif() file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP-${VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX} ${CMAKE_SHARED_LIBRARY_PREFIX}CLHEP${CMAKE_SHARED_LIBRARY_SUFFIX} WORKING_DIRECTORY \"\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}\" )" ) endif() - INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink ) + if (CLHEP_BUILD_STATIC_LIBS) + INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_static_symlink ) + endif() INSTALL(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/clhep_shared_symlink ) endmacro(clhep_build_libclhep ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepBuildTest.cmake new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepBuildTest.cmake --- old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepBuildTest.cmake 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepBuildTest.cmake 2025-09-10 18:29:55.000000000 +0200 @@ -26,14 +26,14 @@ if( CTST_NOLIB ) set(package_library_list) else() - set( package_library_list ${PACKAGE}S) + set( package_library_list ${PACKAGE}) #set( package_library_list ${PROJECT_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${PACKAGE}-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ) endif() if( ${PACKAGE}_DEPS ) foreach ( dep ${${PACKAGE}_DEPS} ) ##message( STATUS "clhep_test ${testname} will use ${dep}") - list(APPEND package_library_list ${PACKAGE}S) + list(APPEND package_library_list ${PACKAGE}) #list(APPEND package_library_list ${PROJECT_BINARY_DIR}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}CLHEP-${dep}-${VERSION}${CMAKE_STATIC_LIBRARY_SUFFIX} ) endforeach() endif() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepToolchain.cmake new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepToolchain.cmake --- old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepToolchain.cmake 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepToolchain.cmake 2025-09-10 18:29:55.000000000 +0200 @@ -57,10 +57,16 @@ # First build up list of all modular targets, static and shared set(CLHEP_libraries_all ${CLHEP_libraries}) foreach(_lib ${CLHEP_libraries}) - list(APPEND CLHEP_libraries_all "${_lib}S") + if (CLHEP_BUILD_STATIC_LIBS) + list(APPEND CLHEP_libraries_all "${_lib}S") + endif() endforeach() -export(TARGETS CLHEP CLHEPS ${CLHEP_libraries_all} +if (CLHEP_BUILD_STATIC_LIBS) + list(APPEND CLHEP_libraries_all "CLHEPS") +endif() + +export(TARGETS CLHEP ${CLHEP_libraries_all} NAMESPACE "CLHEP::" FILE ${PROJECT_BINARY_DIR}/CLHEPLibraryDepends.cmake ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepVariables.cmake new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepVariables.cmake --- old/CLHEP-CLHEP_2_4_7_1/cmake/Modules/ClhepVariables.cmake 2023-10-12 20:36:02.000000000 +0200 +++ new/CLHEP-CLHEP_2_4_7_2/cmake/Modules/ClhepVariables.cmake 2025-09-10 18:29:55.000000000 +0200 @@ -26,6 +26,9 @@ # CLHEP_BUILD_DOCS is OFF (false) by default option(CLHEP_BUILD_DOCS "Build and install CLHEP documentation" OFF) +# CLHEP_BUILD_STATIC_LIBS is ON (true) by default +option(CLHEP_BUILD_STATIC_LIBS "Build and install CLHEP static libraries" ON) + macro( clhep_check_variable_names ) # useful if you need to check a variable message( STATUS "clhep_check_variable_names: CMAKE_SYSTEM_NAME is ${CMAKE_SYSTEM_NAME}" ) @@ -301,6 +304,36 @@ endif() endmacro( _clhep_verify_cxx20 ) +macro( _clhep_verify_cxx23 ) + if( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang" ) + if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 17.0 ) + message( FATAL_ERROR "c++23 extension is not available for ${CMAKE_CXX_COMPILER_ID}${CMAKE_CXX_COMPILER_VERSION}") + else() + set( HAVE_STDCXX true ) + endif() + elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "AppleClang" ) + if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16.0 ) + message( FATAL_ERROR "c++23 extension is not available for ${CMAKE_CXX_COMPILER_ID}${CMAKE_CXX_COMPILER_VERSION}") + else() + set( HAVE_STDCXX true ) + endif() + elseif( ${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel" ) + if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 2022.3) + message( FATAL_ERROR "c++23 extension is not available for ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION}") + else() + set( HAVE_STDCXX true ) + endif() + elseif(CMAKE_COMPILER_IS_GNUCXX) + if( CMAKE_CXX_COMPILER_VERSION VERSION_LESS 11.0.0 ) + message( FATAL_ERROR "c++23 extension is not available for ${CMAKE_CXX_COMPILER}") + else() + set( HAVE_STDCXX true ) + endif() + else() + message(STATUS "clhep_set_compiler_flags: Do not know how to set c++23 extensions for ${CMAKE_CXX_COMPILER_ID}") + endif() +endmacro( _clhep_verify_cxx23 ) + macro( _clhep_check_cxxstd ) if( CLHEP_DEBUG_MESSAGES ) message(STATUS "_clhep_check_cxxstd debug: CMAKE_CXX_COMPILER: ${CMAKE_CXX_COMPILER}") @@ -326,8 +359,10 @@ _clhep_verify_cxx2a() elseif( "${CLHEP_BUILD_CXXSTD}" STREQUAL "-std=c++20" ) _clhep_verify_cxx20() + elseif( "${CLHEP_BUILD_CXXSTD}" STREQUAL "-std=c++23" ) + _clhep_verify_cxx23() elseif( DEFINED CLHEP_BUILD_CXXSTD ) - message( FATAL_ERROR "${CLHEP_BUILD_CXXSTD} is not supported. Supported extensions are c++11, c++1y, c++14, c++1z, c++17, c++2a, and c++20.") + message( FATAL_ERROR "${CLHEP_BUILD_CXXSTD} is not supported. Supported extensions are c++11, c++1y, c++14, c++1z, c++17, c++2a, c++20 and c++23.") else() # presume -std=c++11 set(CLHEP_BUILD_CXXSTD "-std=c++11")
