@@ -106,8 +106,6 @@ IF( NOT EIGEN3_INCLUDES )
106106 MESSAGE ( FATAL_ERROR "Please point the environment variable EIGEN3_INCLUDES to the include directory of your Eigen3 installation." )
107107ENDIF ()
108108
109- set (CMAKE_CXX_STANDARD 17)
110-
111109IF (BUILD_WITH_QT)
112110 IF (NOT DEFINED CMAKE_PREFIX_PATH )
113111 set (CMAKE_PREFIX_PATH CACHE PATH "" )
@@ -142,7 +140,7 @@ IF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU"
142140 set (CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -D__APPLE__" )
143141 ENDIF ()
144142 # Enable C++11 mode on C++ / Clang
145- set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -D__Unix__ -fPIC -g" )
143+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++20 -D__Unix__ -fPIC -g" )
146144 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__Unix__ -fPIC" )
147145 IF (BUILD_FOR_PHI AND CMAKE_CXX_COMPILER_ID MATCHES "Intel" )
148146 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xMIC-AVX512" )
@@ -386,6 +384,24 @@ add_executable(xrf_maps
386384set_target_properties (libxrf_fit PROPERTIES PREFIX "" )
387385set_target_properties (libxrf_io PROPERTIES PREFIX "" )
388386
387+ set_target_properties (libxrf_fit PROPERTIES
388+ CXX_STANDARD 20
389+ CXX_STANDARD_REQUIRED YES
390+ CXX_EXTENSIONS NO
391+ )
392+
393+ set_target_properties (libxrf_io PROPERTIES
394+ CXX_STANDARD 20
395+ CXX_STANDARD_REQUIRED YES
396+ CXX_EXTENSIONS NO
397+ )
398+
399+ set_target_properties (xrf_maps PROPERTIES
400+ CXX_STANDARD 20
401+ CXX_STANDARD_REQUIRED YES
402+ CXX_EXTENSIONS NO
403+ )
404+
389405# Always write the output file directly into the 'libxrf_fit' directory (even on MSVC)
390406set (CompilerFlags
391407 LIBRARY_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY_RELEASE LIBRARY_OUTPUT_DIRECTORY_DEBUG
0 commit comments