From 82e608f990262f392ff571f6c033e9983c5f27aa Mon Sep 17 00:00:00 2001 From: AzaezelX Date: Tue, 26 Apr 2022 16:03:00 -0500 Subject: [PATCH] add workaround logic for configuration file generation --- Engine/lib/assimp/revision.h.in | 28 ++++++++++++++++++++++++++++ Tools/CMake/libraries/assimp.cmake | 19 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 Engine/lib/assimp/revision.h.in diff --git a/Engine/lib/assimp/revision.h.in b/Engine/lib/assimp/revision.h.in new file mode 100644 index 000000000..6d09afbc6 --- /dev/null +++ b/Engine/lib/assimp/revision.h.in @@ -0,0 +1,28 @@ +#ifndef ASSIMP_REVISION_H_INC +#define ASSIMP_REVISION_H_INC + +#define GitVersion 0x@GIT_COMMIT_HASH@ +#define GitBranch "@GIT_BRANCH@" + +#define VER_MAJOR @ASSIMP_VERSION_MAJOR@ +#define VER_MINOR @ASSIMP_VERSION_MINOR@ +#define VER_PATCH @ASSIMP_VERSION_PATCH@ +#define VER_BUILD @ASSIMP_PACKAGE_VERSION@ + +#define STR_HELP(x) #x +#define STR(x) STR_HELP(x) + +#define VER_FILEVERSION VER_MAJOR,VER_MINOR,VER_PATCH,VER_BUILD +#if (GitVersion == 0) +#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) +#else +#define VER_FILEVERSION_STR STR(VER_MAJOR) "." STR(VER_MINOR) "." STR(VER_PATCH) "." STR(VER_BUILD) " (Commit @GIT_COMMIT_HASH@)" +#endif + +#ifdef NDEBUG +#define VER_ORIGINAL_FILENAME_STR "assimp@LIBRARY_SUFFIX@.dll" +#else +#define VER_ORIGINAL_FILENAME_STR "assimp@LIBRARY_SUFFIX@@CMAKE_DEBUG_POSTFIX@.dll" +#endif // NDEBUG + +#endif // ASSIMP_REVISION_H_INC diff --git a/Tools/CMake/libraries/assimp.cmake b/Tools/CMake/libraries/assimp.cmake index 159f5d502..addcf067c 100644 --- a/Tools/CMake/libraries/assimp.cmake +++ b/Tools/CMake/libraries/assimp.cmake @@ -122,6 +122,23 @@ addDef(ASSIMP_BUILD_NO_GLTF_EXPORTER) #addDef(ASSIMP_BUILD_NO_X_EXPORTER) #addDef(ASSIMP_BUILD_NO_X3D_EXPORTER) +addDef(ASSIMP_IGNORE_GIT_HASH) +SET(GIT_COMMIT_HASH 0) +SET(GIT_BRANCH 0) +SET(ASSIMP_VERSION_MAJOR 5) +SET(ASSIMP_VERSION_MINOR 2) +SET(ASSIMP_VERSION_PATCH 3) +SET(ASSIMP_PACKAGE_VERSION "5_2_3") +CONFIGURE_FILE( + ${libDir}/assimp/revision.h.in + ${libDir}/assimp/revision.h +) + +CONFIGURE_FILE( + ${libDir}/assimp/include/assimp/config.h.in + ${libDir}/assimp/include/assimp/config.h +) + addInclude(${libDir}/assimp) addInclude(${libDir}/assimp/include/) addInclude(${libDir}/assimp/include/assimp) @@ -131,6 +148,8 @@ addInclude(${libDir}/assimp/contrib/irrXML) addInclude(${libDir}/assimp/contrib/Open3DGC) addInclude(${libDir}/assimp/contrib/openddlparser) addInclude(${libDir}/assimp/contrib/poly2tri) +addInclude(${libDir}/assimp/contrib/pugixml/src) +addInclude(${libDir}/assimp/contrib/pugixml/contrib) addInclude(${libDir}/assimp/contrib/rapidjson) addInclude(${libDir}/assimp/contrib/rapidjson/include) addInclude(${libDir}/assimp/contrib/unzip)