Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
8dc216b
[legacy] boost: Bump 1.87.0
fuhlig1 Feb 18, 2025
064bca2
[legacy] fmt: Bump 11.1.4
fuhlig1 Feb 18, 2025
8a473ef
[legacy] dds: Bump 3.13
fuhlig1 Feb 18, 2025
5fe35a6
[legacy] fairlogger: Bump 2.2.0
fuhlig1 Feb 18, 2025
c949c98
[legacy] fairmq: Bump 1.9.2
fuhlig1 Feb 18, 2025
d5ad9da
[legacy] pythia8: Bump 8315
fuhlig1 Feb 18, 2025
70e3d23
[legacy] geant4: Bump 11.3.2
fuhlig1 Sep 4, 2025
f40bbd6
[legacy] geant3: Bump 4-4_fairsoft
fuhlig1 Feb 18, 2025
ce59805
[legacy] vgm: Bump 5-3-1
fuhlig1 Feb 18, 2025
655d684
[legacy] geant4_vmc: Bump 6-7-p1
fuhlig1 Feb 18, 2025
957148e
[legacy] vecgeom: Add new v.2.0.0-rc.6
fuhlig1 Feb 18, 2025
78eaa2d
[legacy] pythia6: Remove the package
fuhlig1 Feb 18, 2025
cd42599
[legacy] root: Bump 6.36.04
fuhlig1 Feb 18, 2025
86ca1f2
[legacy] hepmc: Fix build system for CMake 4.0.1
fuhlig1 Apr 22, 2025
512d1bc
[legacy] zeromq: Fix build system for CMake 4.0.1
fuhlig1 Apr 22, 2025
2592907
[legacy] vc: Fix build system for CMake 4.0.1
fuhlig1 Apr 22, 2025
b776984
[legacy] vmc: Bump 2-1
fuhlig1 Apr 22, 2025
97aca7a
[legacy] clhep: Allow compilation with c++23
fuhlig1 Jul 11, 2025
cfd65cd
[legacy] Bump minimal CMake version to 3.24
fuhlig1 Sep 1, 2025
abfd323
[legacy] Fix RPATH information
fuhlig1 Sep 4, 2025
812e119
[legacy] bootstrap-cmake.sh: Bump to v4.1.1
fuhlig1 Sep 5, 2025
acdc75b
[legacy] onnxruntime: Bump 1.22.2
fuhlig1 Sep 5, 2025
4006752
[legacy] Allow passing external compiler info
fuhlig1 Sep 8, 2025
66d0971
[legacy] Update information about tested systems
fuhlig1 Sep 8, 2025
19a0070
[legacy] Update setup scripts
fuhlig1 Sep 8, 2025
74f9dc5
[legacy] root: Properly uses defined macosx SDK
fuhlig1 Jun 23, 2025
92d4e19
[legacy] On macosx use Homebrews patch and make
fuhlig1 Sep 22, 2025
a3c85b4
[legacy] documentation: Add infos macosx
fuhlig1 Sep 17, 2025
f7ea426
[legacy] boost: Build Boost with correct SDK
fuhlig1 Sep 23, 2025
4f833f0
[legacy] pythia8: Build Pythia8 with correct SDK
fuhlig1 Sep 23, 2025
ae8afc1
[legacy] root: Cleanup rootcling patch
fuhlig1 Sep 24, 2025
86f75d1
[legacy] build system: Allow setting the proper SDK
fuhlig1 Jun 24, 2025
2312ba5
[legacy] test: Allow test with non standard SDK on macosx
fuhlig1 Oct 11, 2025
02d488d
[legacy] test: Add test of FairRoot dev branch
fuhlig1 Oct 11, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FairSoftConfig.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ endif()
# `brew` contains some logic to detect installed SDKs on your machine and can choose the latest.
# Since we anyways depend on brew, let's use it.
#
if(APPLE)
if(APPLE AND NOT CMAKE_OSX_SYSROOT)
execute_process(COMMAND brew ruby -e "puts MacOS.sdk_path" OUTPUT_VARIABLE macos_sdk_path)
string(STRIP "${macos_sdk_path}" macos_sdk_path)
set(CMAKE_OSX_SYSROOT "${macos_sdk_path}" CACHE FILEPATH "macOS SDK" FORCE)
Expand Down
24 changes: 14 additions & 10 deletions FairSoft_test.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -154,15 +154,19 @@ if (BUILD_METHOD STREQUAL legacy)
list(APPEND options "-DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD}")
endif()
if(APPLE)
execute_process(COMMAND brew --prefix python OUTPUT_VARIABLE python_prefix)
string(STRIP "${python_prefix}" python_prefix)
list(APPEND options "-DPython_EXECUTABLE=${python_prefix}/bin/python3")
execute_process(COMMAND brew --prefix icu4c OUTPUT_VARIABLE icu_prefix)
string(STRIP "${icu_prefix}" icu_prefix)
list(APPEND options "-DICU_ROOT=${icu_prefix}")
execute_process(COMMAND brew ruby -e "puts MacOS.sdk_path" OUTPUT_VARIABLE macos_sdk_path)
string(STRIP "${macos_sdk_path}" macos_sdk_path)
list(APPEND options "-DCMAKE_OSX_SYSROOT=${macos_sdk_path}")
if(NOT CMAKE_OSX_SYSROOT)
execute_process(COMMAND brew --prefix python OUTPUT_VARIABLE python_prefix)
string(STRIP "${python_prefix}" python_prefix)
list(APPEND options "-DPython_EXECUTABLE=${python_prefix}/bin/python3")
execute_process(COMMAND brew --prefix icu4c OUTPUT_VARIABLE icu_prefix)
string(STRIP "${icu_prefix}" icu_prefix)
list(APPEND options "-DICU_ROOT=${icu_prefix}")
execute_process(COMMAND brew ruby -e "puts MacOS.sdk_path" OUTPUT_VARIABLE macos_sdk_path)
string(STRIP "${macos_sdk_path}" macos_sdk_path)
list(APPEND options "-DCMAKE_OSX_SYSROOT=${macos_sdk_path}")
else()
list(APPEND options "-DCMAKE_OSX_SYSROOT=${CMAKE_OSX_SYSROOT}")
endif()
endif()
list(JOIN options ";" optionsstr)
show_big_header("Configuring")
Expand All @@ -176,7 +180,7 @@ if (BUILD_METHOD STREQUAL legacy)
if (_ctest_build_errors)
set(_ctest_build_retval 255)
endif()
if(NOT _ctest_build_errors)
if(NOT _ctest_build_errors AND ${CMAKE_VERSION} VERSION_LESS 4)
ctest_build(RETURN_VALUE _ctest_build_retval
NUMBER_ERRORS _ctest_build_errors
TARGET "onnxruntime"
Expand Down
Loading