Skip to content

fix event viewer on macos #565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lobis merged 2 commits into from
May 5, 2026
Merged

fix event viewer on macos #565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
00f154f
fix event viewer on macos
lobis May 1, 2026
f5f5afd
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] May 1, 2026
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
20 changes: 0 additions & 20 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,26 +340,6 @@ else ()

endif ()

if (CMAKE_SYSTEM_NAME MATCHES "Darwin") # we must call library install here in
# MacOs
foreach (lib ${rest_libraries})
install(
TARGETS ${lib}
RUNTIME DESTINATION bin
LIBRARY DESTINATION bin
ARCHIVE DESTINATION lib)
endforeach ()

foreach (exe ${rest_exes})
install(
TARGETS ${exe}
RUNTIME DESTINATION bin
LIBRARY DESTINATION bin
ARCHIVE DESTINATION lib)
endforeach ()

endif ()

# Copy pcm files
if (CMAKE_SYSTEM_NAME MATCHES "Windows")

Expand Down
5 changes: 3 additions & 2 deletions cmake/thisREST.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,13 +136,14 @@ ${loadLCG}

\# check active shell by checking for existence of _VERSION variable
if [[ -n \\\"\\\${BASH_VERSION}\\\" ]]; then
thisdir=\\\$(cd \\\$(dirname \\\${BASH_ARGV[0]}); pwd)
thisfile=\\\${BASH_SOURCE[0]}
elif [[ -n \\\"\\\${ZSH_VERSION}\\\" ]]; then
thisdir=\\\$(cd \\\$(dirname \\\$0); pwd)
thisfile=\\\${(%):-%x}
else
echo \\\"Invalid shell! Either source with bash or zsh!\\\"
return 1
fi
thisdir=\\\$(cd \\\"\\\$(dirname \\\"\\\${thisfile}\\\")\\\"; pwd)

\# if thisroot.sh script is found we load the same ROOT version as used in compilation
if [[ -f \\\"${thisROOT}\\\" ]]; then
Expand Down
2 changes: 2 additions & 0 deletions source/framework/core/src/TRestDataSet.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,8 @@
///
#include "TRestDataSet.h"

#include <TLeaf.h>

#include "TRestRun.h"
#include "TRestTools.h"

Expand Down
Loading