CMake: Centralise C++ version and set to 17

flucoma · Apr 28, 2022 · 7bf0ba3 · 7bf0ba3
1 parent 28b908f
commit 7bf0ba3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -8,6 +8,10 @@
 
 cmake_minimum_required(VERSION 3.11)
 
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 set(CMAKE_INSTALL_PREFIX "${CMAKE_CURRENT_SOURCE_DIR}/release-packaging" CACHE PATH "")
 # message(FATAL_ERROR ${CMAKE_INSTALL_PREFIX})
 

diff --git a/scripts/target_post.cmake b/scripts/target_post.cmake
@@ -30,13 +30,6 @@ target_include_directories(
   "${FLUID_VERSION_PATH}"
 )
 
-set_target_properties(${PROG} 
-    PROPERTIES
-    CXX_STANDARD 14
-    CXX_STANDARD_REQUIRED ON
-    CXX_EXTENSIONS OFF
-)
-
 if (APPLE)
   #targeting <= 10.9, need to explicitly set libc++
   target_compile_options(${PROG} PRIVATE -stdlib=libc++)