Fix build failure with minizip >= 1.3.1.2: code/Common/ZipArchiveIOSystem.cpp:57:14: fatal error: 'unzip.h' file not found # include ^~~~~~~~~ https://github.com/assimp/assimp/issues/6576 --- CMakeLists.txt +++ CMakeLists.txt @@ -550,11 +550,17 @@ IF( NOT IOS ) IF( NOT ASSIMP_BUILD_MINIZIP ) use_pkgconfig(UNZIP minizip) + IF(${UNZIP_VERSION} VERSION_GREATER_EQUAL "1.3.1.2") + add_definitions(-DMINIZIP1_3_1_2) + ENDIF() ENDIF() ELSE () IF( NOT BUILD_SHARED_LIBS ) IF( NOT ASSIMP_BUILD_MINIZIP ) use_pkgconfig(UNZIP minizip) + IF(${UNZIP_VERSION} VERSION_GREATER_EQUAL "1.3.1.2") + add_definitions(-DMINIZIP1_3_1_2) + ENDIF() ENDIF() ENDIF () ENDIF () --- code/AssetLib/IFC/IFCLoader.cpp +++ code/AssetLib/IFC/IFCLoader.cpp @@ -50,7 +50,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #ifndef ASSIMP_BUILD_NO_COMPRESSED_IFC -#ifdef ASSIMP_USE_HUNTER +#if defined(ASSIMP_USE_HUNTER) || defined(MINIZIP1_3_1_2) #include #else #include --- code/Common/ZipArchiveIOSystem.cpp +++ code/Common/ZipArchiveIOSystem.cpp @@ -51,7 +51,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include #include -#ifdef ASSIMP_USE_HUNTER +#if defined(ASSIMP_USE_HUNTER) || defined(MINIZIP1_3_1_2) # include #else # include