Merge branch 'master' into so-unloading

This commit is contained in:
Kim Kulling
2021-12-20 17:58:18 +01:00
committed by GitHub
5 changed files with 8 additions and 6 deletions
+2 -2
View File
@@ -480,6 +480,6 @@ void X3DImporter::ParseHelper_Node_Exit() {
}
}
#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
} // namespace Assimp
#endif // !ASSIMP_BUILD_NO_X3D_IMPORTER
+1 -1
View File
@@ -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
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../include>