Merge pull request #6 from jgaffiot/fix_cxx_std_setting

Fix cxx std setting

Author: jgaffiot

README.md

@@ -104,17 +104,17 @@ for instance.
 ### Tooling installation
 - `pre-commit`, as a Python tool, can be installed with:
 
-  - `pipx`
+      + `pipx`
 
-          pipx install pre-commit
+            pipx install pre-commit
 
-  - `pip` (or `pip3` on Debian-like distribution)
+    + `pip` (or `pip3` on Debian-like distribution)
 
-          pip install -U pre-commit
+            pip install -U pre-commit
 
-  - `snap` (system-wide)
+    + `snap` (system-wide)
 
-          sudo snap install pre-commit
+            sudo snap install pre-commit
 
   and perhaps from your distribution package manager.
 

source/CMakeLists.txt

@@ -48,6 +48,15 @@ else()
     message(STATUS "Tools version: ${TOOLS_VERSION}")
 endif()
 
+# ------------------------------------------------------------------------------------ #
+# Set default C++ standard to C++17
+set(CMAKE_CXX_STANDARD 17)
+# set(CMAKE_CXX_STANDARD_REQUIRED True)
+# Set warnings
+set(CMAKE_CXX_FLAGS
+    "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wno-long-long -Wno-vla"
+)
+
 # ------------------------------------------------------------------------------------ #
 # Set compilation version
 if(CMAKE_BUILD_TYPE MATCHES "Debug")
@@ -128,16 +137,6 @@ if(USE_ROOT)
     include_directories(SYSTEM ${ROOT_INCLUDE_DIRS})
 endif(USE_ROOT)
 
-# ------------------------------------------------------------------------------------ #
-# Set compiler option Set C++ 17 if not already set
-if(NOT CMAKE_CXX_FLAGS MATCHES "-std=c\\+\\+")
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
-endif()
-# Set warnings
-set(CMAKE_CXX_FLAGS
-    "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wpedantic -Wno-long-long -Wno-vla"
-)
-
 # ------------------------------------------------------------------------------------ #
 # Set the headers directory
 include_directories(${PROJECT_SOURCE_DIR}/inc ${PROJECT_BINARY_DIR})

source/ToolsConfig.cmake.in

@@ -15,7 +15,7 @@ get_filename_component(TOOLS_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
 # ------------------------------------------------------------------------------------ #
 # Provide *recommended* compiler flags used by this build of Tools. Don't mess with the
 # actual CMAKE_CXX_FLAGS!!! It's up to the user what to do with these.
-set(TOOLS_CXX_FLAGS " -std=c++17")
+set(TOOLS_CXX_FLAGS "-std=c++17")
 
 # ------------------------------------------------------------------------------------ #
 # Configure the path to the headers