X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=5f3156e467a1c4cd38e1dfd653599796353a9a0b;hb=b4e59846fd2eaf893548f182645e7162da4ad731;hp=2264725e3e42a194ba756af29bf7b4f7ead727b1;hpb=c5b850ec25c2e3ccafe82c6c21d56e0061a53a1d;p=tools%2Flibbatch.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2264725..5f3156e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2021  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 # Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -29,8 +29,8 @@ PROJECT(LibBatch C CXX)
 STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 2)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION 2)
+SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
+SET(${PROJECT_NAME_UC}_PATCH_VERSION 4)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 
@@ -61,6 +61,49 @@ IF(LIBBATCH_LOCAL_SUBMISSION)
   LIBBATCH_FIND_ALL_LOCAL_COMMANDS()
 ENDIF()
 
+INCLUDE(CheckCXXCompilerFlag)
+
+# Option: C++ standard to use
+# Note: CMake by default enables C++ extensions; they can be disabled by additionally
+#       specifying -DCMAKE_CXX_EXTENSIONS=OFF
+SET(LIBBATCH_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
+SET(_supported_standards 11 14 17 20)
+SET(_standard_ok FALSE)
+FOREACH(_standard ${_supported_standards})
+  IF(LIBBATCH_CXX_STANDARD STREQUAL _standard)
+    SET(_standard_ok TRUE)
+    BREAK()
+  ENDIF()
+ENDFOREACH()
+IF(NOT _standard_ok)
+  MESSAGE(FATAL_ERROR "Unsupported C++ standard: ${LIBBATCH_CXX_STANDARD}; allowed values: ${_supported_standards}")
+ENDIF()
+UNSET(_supported_standards)
+UNSET(_standard)
+UNSET(_standard_ok)
+MESSAGE(STATUS "Setting C++ standard to ${LIBBATCH_CXX_STANDARD}")
+SET(CMAKE_CXX_STANDARD ${LIBBATCH_CXX_STANDARD})
+SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+
+IF(NOT (WIN32 OR APPLE))
+  SET(LIBBATCH_DEBUG_WARNINGS FALSE CACHE BOOL "Print more compiler warnings")
+  SET(LIBBATCH_TREAT_WARNINGS_AS_ERRORS FALSE CACHE BOOL "Treat compiler warnings as errors")
+  IF(LIBBATCH_DEBUG_WARNINGS)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wpedantic")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic")
+  ENDIF()
+  IF(LIBBATCH_TREAT_WARNINGS_AS_ERRORS)
+    SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror")
+    SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+  ENDIF()
+ENDIF()
+
+# Compiler flag to disable treating alternative C++ tokens (compatibility with MSVS)
+CHECK_CXX_COMPILER_FLAG("-fno-operator-names" COMPILER_SUPPORTS_NO_OPERATOR_NAMES)
+IF(COMPILER_SUPPORTS_NO_OPERATOR_NAMES)
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-operator-names")
+ENDIF()
+
 # Prerequisites detection:
 # ========================
 FIND_PACKAGE(LibbatchPThread REQUIRED)