From 0ada8b3b5e746225e18b0884ad3a69a921ac0708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Andersen?= Date: Sun, 31 Jul 2022 22:08:27 +0200 Subject: [PATCH 1/6] Fixed typo --- INSTALL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/INSTALL b/INSTALL index 2cfd38078..410050b10 100644 --- a/INSTALL +++ b/INSTALL @@ -14,4 +14,4 @@ https://assimp-docs.readthedocs.io/en/latest/ Building Assimp ------------------------------ -Just check the build-instaructions which you can find here: https://github.com/assimp/assimp/blob/master/Build.md +Just check the build-instructions which you can find here: https://github.com/assimp/assimp/blob/master/Build.md From 8c63ed04552fbb399a802801f42616288d5a556a Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Mon, 1 Aug 2022 09:46:08 +0200 Subject: [PATCH 2/6] Experiment: try< to enable parallel build --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 9f7799daa..bf346dd63 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -110,7 +110,7 @@ jobs: cmakeListsOrSettingsJson: CMakeListsTxtAdvanced cmakeListsTxtPath: '${{ github.workspace }}/CMakeLists.txt' cmakeAppendedArgs: '-GNinja -DCMAKE_BUILD_TYPE=Release ${{ steps.windows_extra_cmake_args.outputs.args }} ${{ steps.hunter_extra_cmake_args.outputs.args }}' - buildWithCMakeArgs: '-- -v' + buildWithCMakeArgs: '-- -j 24 -v' buildDirectory: '${{ github.workspace }}/build/' - name: Exclude certain tests in Hunter specific builds From 5084a4d155de28ae39c310f77889f13119e545b4 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 5 Aug 2022 20:49:37 +0200 Subject: [PATCH 3/6] Use [[fallthrough]]; to mark whished fallthroughs - closes https://github.com/assimp/assimp/issues/4654 --- code/AssetLib/3DS/3DSConverter.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/AssetLib/3DS/3DSConverter.cpp b/code/AssetLib/3DS/3DSConverter.cpp index 2421d5460..b4f625b76 100644 --- a/code/AssetLib/3DS/3DSConverter.cpp +++ b/code/AssetLib/3DS/3DSConverter.cpp @@ -262,7 +262,8 @@ void Discreet3DSImporter::ConvertMaterial(D3DS::Material &oldMat, unsigned int iWire = 1; mat.AddProperty((int *)&iWire, 1, AI_MATKEY_ENABLE_WIREFRAME); } -// fallthrough + [[fallthrough]]; + case D3DS::Discreet3DS::Gouraud: eShading = aiShadingMode_Gouraud; break; From 1b0682297df9728a13e6017af92de62d30ff01d2 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 5 Aug 2022 21:06:10 +0200 Subject: [PATCH 4/6] Update to c++17 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2c55fce0a..69187ce5e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -257,7 +257,7 @@ ENDIF() # Grouped compiler settings ######################################## IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW) IF(NOT ASSIMP_HUNTER_ENABLED) - SET(CMAKE_CXX_STANDARD 11) + SET(CMAKE_CXX_STANDARD 17) SET(CMAKE_POSITION_INDEPENDENT_CODE ON) ENDIF() # hide all not-exported symbols From ec131d03451d8f50706020155733930224735ee1 Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Fri, 5 Aug 2022 21:47:58 +0200 Subject: [PATCH 5/6] Update CMakeLists.txt --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 69187ce5e..458a32834 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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") From 4aaa807704811ce1b7dca4e1e28842f2ec519bfe Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 6 Aug 2022 18:37:12 +0200 Subject: [PATCH 6/6] Add dot only when the extension is not empty. --- tools/assimp_cmd/Export.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tools/assimp_cmd/Export.cpp b/tools/assimp_cmd/Export.cpp index fd9fc7652..b78db157b 100644 --- a/tools/assimp_cmd/Export.cpp +++ b/tools/assimp_cmd/Export.cpp @@ -153,7 +153,9 @@ int Assimp_Export(const char *const *params, unsigned int num) { } // derive the final file name - out += "." + outext; + if (!outext.empty()) { + out += "." + outext; + } // and call the export routine if (!ExportModel(scene, import, out, e->id)) {