Skip to content

Commit

Permalink
Fix the CI problems
Browse files Browse the repository at this point in the history
- Set conan cppstd to gnu17
- Use CMAKE_CXX_STANDARD to be 17
- Add CONAN_ENABLED guards
  • Loading branch information
YanzhaoW committed Jan 14, 2025
1 parent f110493 commit 1d6fc06
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 7 deletions.
3 changes: 3 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@ cmake_policy(VERSION 3.15...3.31)
# Set name of our project to "R3BROOT". Has to be done after check of cmake version
project(R3BROOT LANGUAGES C CXX Fortran)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_EXTENSIONS ON)

# use default gnu install convention:
include(GNUInstallDirs)

Expand Down
3 changes: 2 additions & 1 deletion CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@
"BUILD_GEOMETRY": "OFF",
"CMAKE_BUILD_TYPE": "RelWithDebInfo",
"CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "util/cmake-conan/conan_provider.cmake",
"CONAN_ENABLED": "ON"
"CONAN_ENABLED": "ON",
"CONAN_INSTALL_ARGS": "--build=missing;--settings:build=compiler.cppstd=gnu17"
}
},
{
Expand Down
18 changes: 12 additions & 6 deletions r3bsource/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,6 @@ set(SRCS
califa/R3BCalifaJulichReader.cxx
tofd/R3BPtofReader.cxx
neuland/R3BNeulandTamexReader.cxx
neuland/R3BNeulandTamexReader2.cxx
neuland/R3BNeulandTacquilaReader.cxx
stubes/R3BStrawtubesReader.cxx
ams/R3BAmsReader.cxx
Expand Down Expand Up @@ -236,7 +235,6 @@ set(HEADERS
califa/R3BCalifaJulichReader.h
tofd/R3BPtofReader.h
neuland/R3BNeulandTamexReader.h
neuland/R3BNeulandTamexReader2.h
neuland/R3BNeulandTacquilaReader.h
stubes/R3BStrawtubesReader.h
ams/R3BAmsReader.h
Expand All @@ -252,6 +250,11 @@ set(HEADERS
mwpc/R3BMwpcReader.h
sync_check/R3BSyncCheckReader.h)

if(CONAN_ENABLED)
list(APPEND SRCS neuland/R3BNeulandTamexReader2.cxx)
list(APPEND HEADERS neuland/R3BNeulandTamexReader2.h)
endif()

set(HEADERS ${STRUCT_HEADERS} ${HEADERS})

set(DIRS
Expand Down Expand Up @@ -295,7 +298,10 @@ add_library_with_dictionary(
${DIRS}
DEPENDENCIES
R3BData
Ucesb
PRIVATE_DEPENDENCIES
Microsoft.GSL::GSL
range-v3::range-v3)
Ucesb)

if(CONAN_ENABLED)
target_link_libraries(R3BSource PRIVATE Microsoft.GSL::GSL range-v3::range-v3)
list(APPEND SRCS neuland/R3BNeulandTamexReader2.cxx)
list(APPEND HEADERS neuland/R3BNeulandTamexReader2.h)
endif()

0 comments on commit 1d6fc06

Please sign in to comment.