Skip to content

Commit f9c6b91

Browse files
Make #include <meta> work
1 parent 641f233 commit f9c6b91

2 files changed

Lines changed: 4 additions & 10 deletions

File tree

GPU/GPUTracking/Standalone/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if(GPUCA_CONFIG_WERROR)
7070
else()
7171
string(APPEND CMAKE_CXX_FLAGS " -Wno-error")
7272
endif()
73-
string(APPEND CMAKE_CXX_FLAGS " -Wall -Wextra -Wshadow -Wno-unused-function -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-write-strings")
73+
string(APPEND CMAKE_CXX_FLAGS " -freflection -std=c++26 -Wall -Wextra -Wshadow -Wno-unused-function -Wno-unused-parameter -Wno-unused-local-typedefs -Wno-unknown-pragmas -Wno-write-strings")
7474
string(APPEND CMAKE_SHARED_LINKER_FLAGS " -rdynamic -Wl,--no-undefined")
7575
if(CMAKE_CXX_COMPILER MATCHES "clang\\+\\+")
7676
string(APPEND CMAKE_CXX_FLAGS " -Wno-vla-cxx-extension")

GPU/GPUTracking/Standalone/cmake/config.cmake

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ set(ENABLE_HIP 0)
1717
set(ENABLE_OPENCL 0)
1818
set(GPUCA_CONFIG_VC 1)
1919
set(GPUCA_CONFIG_FMT 1)
20-
set(GPUCA_CONFIG_ROOT 1)
20+
set(GPUCA_CONFIG_ROOT 0)
2121
set(GPUCA_CONFIG_ONNX 0)
2222
set(GPUCA_BUILD_EVENT_DISPLAY 0)
2323
set(GPUCA_BUILD_EVENT_DISPLAY_FREETYPE 1)
@@ -26,7 +26,7 @@ set(GPUCA_BUILD_EVENT_DISPLAY_WAYLAND 1)
2626
set(GPUCA_BUILD_EVENT_DISPLAY_QT 1)
2727
set(GPUCA_CONFIG_GL3W 0)
2828
set(GPUCA_CONFIG_O2 1)
29-
set(GPUCA_BUILD_DEBUG 1) # Prevents float point exception at runtime (TODO: fix)
29+
set(GPUCA_BUILD_DEBUG 1) # Prevents float point exception at runtime and compiler warning (TODO: fix)
3030
set(GPUCA_BUILD_DEBUG_SANITIZE 0)
3131
set(GPUCA_BUILD_DEBUG_HOSTONLY 0)
3232
set(GPUCA_DETERMINISTIC_MODE GPU) # OFF / NO_FAST_MATH / OPTO2 / GPU / WHOLEO2
@@ -38,18 +38,12 @@ set(CUDA_COMPUTETARGET "default" CACHE STRING "CUDA_COMPUTETARGET") # 86 89
3838
#set(GPUCA_HIP_COMPILE_MODE perkernel)
3939
#set(GPUCA_RTC_NO_COMPILED_KERNELS 1)
4040
#set(GPUCA_KERNEL_RESOURCE_USAGE_VERBOSE 1)
41-
set(GPUCA_CONFIG_COMPILER /opt/gcc/bin/g++) # gcc / clang / /opt/clang-p2996/bin/clang++
41+
set(GPUCA_CONFIG_COMPILER gcc) # gcc / clang
4242
#set(GPUCA_CONFIG_WERROR 1)
4343
#add_definitions(-DGPUCA_GPU_DEBUG_PRINT)
4444
#set(GPUCA_OVERRIDE_PARAMETER_FILE "foo.csv")
4545

4646
if(GPUCA_CONFIG_COMPILER MATCHES "clang")
4747
add_compile_options(--gcc-toolchain=/cvmfs/alice.cern.ch/el9-x86_64/Packages/GCC-Toolchain/v14.2.0-alice2-1 -freflection-latest -std=c++26) # -stdlib=libc++
4848
add_link_options(--gcc-toolchain=/cvmfs/alice.cern.ch/el9-x86_64/Packages/GCC-Toolchain/v14.2.0-alice2-1 -lstdc++ -lm)
49-
else()
50-
get_filename_component(_gcc_bin_dir "${GPUCA_CONFIG_COMPILER}" DIRECTORY)
51-
get_filename_component(_gcc_root "${_gcc_bin_dir}" DIRECTORY)
52-
list(APPEND CMAKE_INSTALL_RPATH "${_gcc_root}/lib64")
53-
add_compile_options(-freflection -std=c++26)
5449
endif()
55-

0 commit comments

Comments
 (0)