From 92aef9236fc58277b2b6e6639e160e7cf7eeb4b2 Mon Sep 17 00:00:00 2001 From: rumgot Date: Tue, 14 Dec 2021 23:54:36 +0300 Subject: [PATCH 1/7] Fixed cmake error: No known features for C compiler when using the assimp library from another project. --- code/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index e45bf8a2a..1af9407d2 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -1172,7 +1172,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 $ From 7a29147095af60d956838f07e3f50b3b68da4091 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 16 Dec 2021 14:55:23 +0100 Subject: [PATCH 2/7] Fix a typo --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34bcb9663..22df03370 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -762,7 +762,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") From af42d53c92487badcb396e9594157dcfdb196d68 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 16 Dec 2021 19:41:15 +0100 Subject: [PATCH 3/7] Enable C++17 and C99 - closes https://github.com/assimp/assimp/issues/4257 --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 22df03370..b96f915bd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,8 +182,10 @@ 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 ) + # Enable C++17 support globally + set(CMAKE_CXX_STANDARD 17) + set(CMAKE_CXX_STANDARD_REQUIRED ON) + set(CMAKE_C_STANDARD 99) endif() IF(NOT ASSIMP_IGNORE_GIT_HASH) From 2ffa0c59ebc6622d018474bbb921171d541c99dc Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Thu, 16 Dec 2021 19:54:40 +0100 Subject: [PATCH 4/7] Switch to C++11 until gtest gets an update. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b96f915bd..bbc7ee744 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,8 +182,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++17 support globally - set(CMAKE_CXX_STANDARD 17) + # Enable C++11 support globally + set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_C_STANDARD 99) endif() From d7bf8d6e07f60e91f5570835ace179b4f96cf943 Mon Sep 17 00:00:00 2001 From: sssaoi Date: Sat, 18 Dec 2021 14:50:22 +0900 Subject: [PATCH 5/7] Fix compile error when ASSIMP_BUILD_NO_X3D_IMPORTER is define. --- code/AssetLib/X3D/X3DImporter.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From 7fc46035798fe236b4ef8858ea0acc9980bff321 Mon Sep 17 00:00:00 2001 From: Garux Date: Sat, 18 Dec 2021 14:32:46 +0300 Subject: [PATCH 6/7] fix test/models/3DS/IMAGE1.bmp: is jpg --- test/models/3DS/{IMAGE1.bmp => IMAGE1.jpg} | Bin test/models/3DS/test1.3ds | Bin 10654 -> 10654 bytes 2 files changed, 0 insertions(+), 0 deletions(-) rename test/models/3DS/{IMAGE1.bmp => IMAGE1.jpg} (100%) 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 17bbb47d397c854c8a53ae633037593a8cee9044..5a52977b0b82b61b0b08d9700ab93950825a33b8 100644 GIT binary patch delta 15 XcmbOiJTG{{o5>rQ#5OZA&d~q>Ia~%c delta 14 WcmbOiJTG{{8)hfpfQ|3hYXAT;DF(Oz From 572e31ddcb3c745dffb39b36a9a266d1e167eb3c Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 18 Dec 2021 21:30:04 +0100 Subject: [PATCH 7/7] Update version to 5.1.4 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bbc7ee744..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 ###############################################