diff --git a/CMakeLists.txt b/CMakeLists.txt index 34bcb9663..570c29305 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -56,7 +56,7 @@ IF(ASSIMP_HUNTER_ENABLED) add_definitions(-DASSIMP_USE_HUNTER) ENDIF() -PROJECT(Assimp VERSION 5.1.3) +PROJECT(Assimp VERSION 5.1.4) # All supported options ############################################### @@ -183,7 +183,9 @@ 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_property( GLOBAL PROPERTY CXX_STANDARD 11 ) + set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_C_STANDARD 99) endif() IF(NOT ASSIMP_IGNORE_GIT_HASH) @@ -762,7 +764,7 @@ if(WIN32) IF(MSVC_TOOLSET_VERSION) SET(MSVC_PREFIX "vc${MSVC_TOOLSET_VERSION}") - SET(ASSIMP_MSVC_VERSION ${MCVS_PREFIX}) + SET(ASSIMP_MSVC_VERSION ${MSVC_PREFIX}) ELSE() IF(MSVC12) SET(ASSIMP_MSVC_VERSION "vc120") diff --git a/code/AssetLib/X3D/X3DImporter.cpp b/code/AssetLib/X3D/X3DImporter.cpp index b8b9d250e..fb8ec9bc5 100644 --- a/code/AssetLib/X3D/X3DImporter.cpp +++ b/code/AssetLib/X3D/X3DImporter.cpp @@ -480,6 +480,6 @@ void X3DImporter::ParseHelper_Node_Exit() { } } -#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER - } // namespace Assimp + +#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 43bd5b825..e7d93bb35 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1173,7 +1173,7 @@ ELSE() ENDIF() # adds C_FLAGS required to compile zip.c on old GCC 4.x compiler -TARGET_COMPILE_FEATURES(assimp PUBLIC c_std_99) +TARGET_COMPILE_FEATURES(assimp PRIVATE c_std_99) TARGET_INCLUDE_DIRECTORIES ( assimp PUBLIC $ diff --git a/test/models/3DS/IMAGE1.bmp b/test/models/3DS/IMAGE1.jpg similarity index 100% rename from test/models/3DS/IMAGE1.bmp rename to test/models/3DS/IMAGE1.jpg diff --git a/test/models/3DS/test1.3ds b/test/models/3DS/test1.3ds index 17bbb47d3..5a52977b0 100644 Binary files a/test/models/3DS/test1.3ds and b/test/models/3DS/test1.3ds differ