Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 Common/Utils/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ o2_add_library(CommonUtils
src/DebugStreamer.cxx
src/DLLoaderBase.cxx
PUBLIC_LINK_LIBRARIES ROOT::Hist ROOT::Tree Boost::iostreams O2::CommonDataFormat O2::Headers
FairLogger::FairLogger O2::MathUtils TBB::tbb)
FairLogger::FairLogger O2::MathUtils TBB::tbb O2::GPUCommon)

o2_target_root_dictionary(CommonUtils
HEADERS include/CommonUtils/TreeStream.h
Expand Down
3 changes: 1 addition & 2 deletions Common/Utils/include/CommonUtils/StringUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@
#include <sstream>
#include <vector>
#include <algorithm>
#include <fmt/format.h>
#include <Rtypes.h>
#include "GPUCommonRtypes.h"

namespace o2
{
Expand Down
5 changes: 5 additions & 0 deletions Common/Utils/src/StringUtils.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
#include "CommonUtils/StringUtils.h"
#include <cstdlib>
#include <filesystem>
#ifndef GPUCA_STANDALONE
#include <TGrid.h>
#include <fmt/format.h>
#endif
#include <unistd.h>

using namespace o2::utils;
Expand Down Expand Up @@ -77,6 +80,7 @@ std::string Str::getFullPath(const std::string_view p)
return std::filesystem::canonical(std::string{p}).string();
}

#ifndef GPUCA_STANDALONE
std::string Str::rectifyDirectory(const std::string_view p)
{
std::string dir(p);
Expand Down Expand Up @@ -104,6 +108,7 @@ std::string Str::rectifyDirectory(const std::string_view p)
}
return dir;
}
#endif

// Create unique non-existing path name starting with prefix. Loose equivalent of boost::filesystem::unique_path()
// The prefix can be either existing directory or just a string to add in front of the random part
Expand Down
6 changes: 2 additions & 4 deletions GPU/GPUTracking/DataTypes/CalibdEdxTrackTopologyPol.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,14 @@
// granted to it by virtue of its status as an Intergovernmental Organization
// or submit itself to any jurisdiction.

#ifndef GPUCA_NO_VC
#ifndef GPUCA_STANDALONE
#include "Rtypes.h"
#include "TFile.h"
#endif
#include "CalibdEdxTrackTopologyPol.h"

#include <cstddef>
#include <string_view>
#if !defined(GPUCA_STANDALONE)
#include "TFile.h"
#endif

using namespace o2::tpc;

Expand Down