Skip to content

Commit dc6f458

Browse files
committed
Fix compilation problem and compiler warnings
MCStepLogger had compilation issues with conflicting C++ versions appearing on the command line. This is avoided by a CMakeList simplification. Also fixing few compilation warnings related to inconsistent virtual + override.
1 parent b3db447 commit dc6f458

File tree

2 files changed

+150
-142
lines changed

2 files changed

+150
-142
lines changed

CMakeLists.txt

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,18 +104,26 @@ find_package(Boost COMPONENTS program_options chrono unit_test_framework REQUIRE
104104
###############################
105105
# Determine CXX STD from ROOT #
106106
###############################
107-
SET(CMAKE_CXX_STANDARD 11)
107+
108+
#
109+
# SW: The following code was there but was
110+
# problematic. In principle, we expect the C++ version
111+
# to be set from the outside via (-DCMAKE_CXX_STANDARD).
112+
# Please send email if this does not work for you.
113+
#
114+
115+
#SET(CMAKE_CXX_STANDARD 11)
108116
# Find ROOT CXX standard
109-
string(FIND ${ROOT_CXX_FLAGS} "-std=" POSITION)
110-
if (${POSITION} GREATER -1)
111-
string(SUBSTRING ${ROOT_CXX_FLAGS} ${POSITION} 11 ROOT_CXX_STD)
112-
if(${ROOT_CXX_STD} STREQUAL "-std=c++1z " OR ${ROOT_CXX_STD} STREQUAL "-std=c++17 ")
113-
SET(CMAKE_CXX_STANDARD 17)
114-
elseif(${ROOT_CXX_STD} STREQUAL "-std=c++1y " OR ${ROOT_CXX_STD} STREQUAL "-std=c++14 ")
115-
SET(CMAKE_CXX_STANDARD 14)
116-
endif()
117-
endif()
118-
message(STATUS "Build with CXX STD ${CMAKE_CXX_STANDARD}")
117+
#string(FIND ${ROOT_CXX_FLAGS} "-std=" POSITION)
118+
#if (${POSITION} GREATER -1)
119+
# string(SUBSTRING ${ROOT_CXX_FLAGS} ${POSITION} 11 ROOT_CXX_STD)
120+
# if(${ROOT_CXX_STD} STREQUAL "-std=c++1z " OR ${ROOT_CXX_STD} STREQUAL "-std=c++17 ")
121+
# SET(CMAKE_CXX_STANDARD 17)
122+
# elseif(${ROOT_CXX_STD} STREQUAL "-std=c++1y " OR ${ROOT_CXX_STD} STREQUAL "-std=c++14 ")
123+
# SET(CMAKE_CXX_STANDARD 14)
124+
# endif()
125+
#endif()
126+
#message(STATUS "Build with CXX STD ${CMAKE_CXX_STANDARD}")
119127

120128
#######################
121129
# Do the installation #

0 commit comments

Comments
 (0)