|
|
@@ -194,8 +194,8 @@ SET (ASSIMP_SOVERSION 5)
|
|
|
|
|
|
SET( ASSIMP_PACKAGE_VERSION "0" CACHE STRING "the package-specific version used for uploading the sources" )
|
|
|
if(NOT ASSIMP_HUNTER_ENABLED)
|
|
|
- # Enable C++11 support globally
|
|
|
- set(CMAKE_CXX_STANDARD 11)
|
|
|
+ # Enable C++17 support globally
|
|
|
+ set(CMAKE_CXX_STANDARD 17)
|
|
|
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
|
|
set(CMAKE_C_STANDARD 99)
|
|
|
endif()
|
|
|
@@ -287,7 +287,7 @@ ELSEIF(MSVC)
|
|
|
SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
|
|
|
ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
|
|
|
IF(NOT ASSIMP_HUNTER_ENABLED)
|
|
|
- SET(CMAKE_CXX_STANDARD 11)
|
|
|
+ SET(CMAKE_CXX_STANDARD 17)
|
|
|
SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
|
|
ENDIF()
|
|
|
SET(CMAKE_CXX_FLAGS "-fvisibility=hidden -fno-strict-aliasing -Wall -Wno-long-long ${CMAKE_CXX_FLAGS}" )
|
|
|
@@ -299,7 +299,7 @@ ELSEIF( MINGW )
|
|
|
message(WARNING "MinGW is old, if you experience errors, update MinGW.")
|
|
|
ENDIF()
|
|
|
IF(NOT ASSIMP_HUNTER_ENABLED)
|
|
|
- SET(CMAKE_CXX_FLAGS "-std=gnu++11 ${CMAKE_CXX_FLAGS}")
|
|
|
+ SET(CMAKE_CXX_FLAGS "-std=gnu++17 ${CMAKE_CXX_FLAGS}")
|
|
|
SET(CMAKE_C_FLAGS "-fPIC ${CMAKE_C_FLAGS}")
|
|
|
ENDIF()
|
|
|
IF (CMAKE_BUILD_TYPE STREQUAL "Debug")
|
Kim Kulling