Browse Source

Moved c++17 compiler flag to CMAKE_CXX_STANDARD variable (#427)

Jorrit Rouwe 2 years ago
parent
commit
c46ef82fa2
2 changed files with 7 additions and 2 deletions
  1. 2 2
      Build/CMakeLists.txt
  2. 5 0
      Jolt/Jolt.cmake

+ 2 - 2
Build/CMakeLists.txt

@@ -63,7 +63,7 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA
 	endif()
 	endif()
 
 
 	# Set general compiler flags
 	# Set general compiler flags
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Zc:__cplusplus /Gm- /Wall /WX /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /Zc:__cplusplus /Gm- /Wall /WX /MP /nologo /diagnostics:classic /FC /fp:except- /Zc:inline")
 	
 	
 	# Optionally generate debug symbols
 	# Optionally generate debug symbols
 	if (GENERATE_DEBUG_SYMBOLS)
 	if (GENERATE_DEBUG_SYMBOLS)
@@ -106,7 +106,7 @@ if (("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows" OR "${CMAKE_SYSTEM_NAME}" STREQUA
 	endif()
 	endif()
 elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR MINGW OR EMSCRIPTEN)
 elseif ("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin" OR "${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR MINGW OR EMSCRIPTEN)
 	# Set general compiler flags
 	# Set general compiler flags
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -I. -Wall -Werror")
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I. -Wall -Werror")
 
 
 	# Optionally generate debug symbols
 	# Optionally generate debug symbols
 	if (GENERATE_DEBUG_SYMBOLS)
 	if (GENERATE_DEBUG_SYMBOLS)

+ 5 - 0
Jolt/Jolt.cmake

@@ -1,3 +1,8 @@
+# Requires C++ 17
+set(CMAKE_CXX_STANDARD 17)
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 # Root
 # Root
 set(JOLT_PHYSICS_ROOT ${PHYSICS_REPO_ROOT}/Jolt)
 set(JOLT_PHYSICS_ROOT ${PHYSICS_REPO_ROOT}/Jolt)