[assimp] Update to 5.3.1, fix pkg-config

ports/assimp/build_fixes.patch

@@ -2,39 +2,19 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 458a328..b8c2fc6 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.2.4)
-+PROJECT(Assimp VERSION 5.2.5)
-
- # All supported options ###############################################
-
-@@ -273,18 +273,18 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
- ELSEIF(MSVC)
-   # enable multi-core compilation with MSVC
-   IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang" ) # clang-cl
--    ADD_COMPILE_OPTIONS(/bigobj /W4 /WX )
-+    ADD_COMPILE_OPTIONS(/bigobj )
-   ELSE() # msvc
--    ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX)
-+    ADD_COMPILE_OPTIONS(/MP /bigobj )
-   ENDIF()
-   # disable "elements of array '' will be default initialized" warning on MSVC2013
-   IF(MSVC12)
-     ADD_COMPILE_OPTIONS(/wd4351)	
+@@ -291,9 +291,9 @@ IF ((CMAKE_C_COMPILER_ID MATCHES "GNU") AND NOT MINGW)
    ENDIF()
-   ADD_COMPILE_OPTIONS(/wd4244) #supress warning for double to float conversion if Double precission is activated
+   # supress warning for double to float conversion if Double precission is activated
+   ADD_COMPILE_OPTIONS(/wd4244) 
 -  SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od")
--  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
+-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
 -  SET(CMAKE_SHARED_LINKER_FLAGS_RELEASE "${CMAKE_SHARED_LINKER_FLAGS_RELEASE} /DEBUG:FULL /PDBALTPATH:%_PDB% /OPT:REF /OPT:ICF")
 +  # SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /D_DEBUG /Zi /Od")
-+  # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Zi")
++  # SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}")
 +  # 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 17)
+     SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 @@ -418,7 +418,7 @@ ENDIF()
 
  set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
@@ -103,7 +83,7 @@ index 6551dcb..0796448 100644
 +    find_dependency(minizip CONFIG)
 +    #find_dependency(openddlparser CONFIG)
 +    find_dependency(poly2tri CONFIG)
-+    #find_dependency(polyclipping  CONFIG)
++    find_dependency(polyclipping CONFIG)
 +    find_dependency(RapidJSON CONFIG)
 +    find_dependency(Stb MODULE)
 +    find_dependency(utf8cpp CONFIG)
@@ -130,28 +110,30 @@ diff --git a/code/AssetLib/Blender/BlenderTessellator.h b/code/AssetLib/Blender/
 index 0d0ba32..c3703c4 100644
 --- a/code/AssetLib/Blender/BlenderTessellator.h
 +++ b/code/AssetLib/Blender/BlenderTessellator.h
-@@ -147,7 +147,7 @@ namespace Assimp
- #ifdef ASSIMP_USE_HUNTER
- #  include <poly2tri/poly2tri.h>
- #else
--#  include "../contrib/poly2tri/poly2tri/poly2tri.h"
-+#  include <poly2tri/poly2tri.h>
- #endif
+@@ -143,7 +143,7 @@ namespace Assimp
+
+ #if ASSIMP_BLEND_WITH_POLY_2_TRI
+
+-#include "contrib/poly2tri/poly2tri/poly2tri.h"
++#include <poly2tri/poly2tri.h>
 
  namespace Assimp
+ {
 diff --git a/code/AssetLib/IFC/IFCGeometry.cpp b/code/AssetLib/IFC/IFCGeometry.cpp
 index ef59542..17e00cd 100644
 --- a/code/AssetLib/IFC/IFCGeometry.cpp
 +++ b/code/AssetLib/IFC/IFCGeometry.cpp
-@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #  include <poly2tri/poly2tri.h>
- #  include <polyclipping/clipper.hpp>
- #else
--#  include "../contrib/poly2tri/poly2tri/poly2tri.h"
-+#  include <poly2tri/poly2tri.h>
- #  include "../contrib/clipper/clipper.hpp"
- #endif
-
+@@ -45,8 +45,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "IFCUtil.h"
+ #include "Common/PolyTools.h"
+ #include "PostProcessing/ProcessHelper.h"
+-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+-#include "contrib/clipper/clipper.hpp"
++#include <poly2tri/poly2tri.h>
++#include <polyclipping/clipper.hpp>
+
+ #include <iterator>
+ #include <memory>
 diff --git a/code/AssetLib/IFC/IFCLoader.cpp b/code/AssetLib/IFC/IFCLoader.cpp
 index 0c20686..e6b20a3 100644
 --- a/code/AssetLib/IFC/IFCLoader.cpp
@@ -169,15 +151,17 @@ diff --git a/code/AssetLib/IFC/IFCOpenings.cpp b/code/AssetLib/IFC/IFCOpenings.c
 index 3c4a0b3..3fab616 100644
 --- a/code/AssetLib/IFC/IFCOpenings.cpp
 +++ b/code/AssetLib/IFC/IFCOpenings.cpp
-@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #  include <poly2tri/poly2tri.h>
- #  include <polyclipping/clipper.hpp>
- #else
--#  include "../contrib/poly2tri/poly2tri/poly2tri.h"
-+#  include <poly2tri/poly2tri.h>
- #  include "../contrib/clipper/clipper.hpp"
- #endif
-
+@@ -47,7 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include "IFCUtil.h"
+ #include "Common/PolyTools.h"
+ #include "PostProcessing/ProcessHelper.h"
+-#include "contrib/poly2tri/poly2tri/poly2tri.h"
+-#include "contrib/clipper/clipper.hpp"
++#include <poly2tri/poly2tri.h>
++#include <polyclipping/clipper.hpp>
+
+ #include <deque>
+ #include <forward_list>
 diff --git a/code/AssetLib/MMD/MMDPmxParser.cpp b/code/AssetLib/MMD/MMDPmxParser.cpp
 index ca37ba1..2ce7bdd 100644
 --- a/code/AssetLib/MMD/MMDPmxParser.cpp
@@ -232,7 +216,7 @@ index 5339454..45e07c0 100644
    find_package(pugixml CONFIG REQUIRED)
  ELSE()
    SET( Pugixml_SRCS
-@@ -910,15 +910,15 @@ ELSE()
+@@ -919,30 +919,30 @@ ELSE()
  ENDIF()
 
  # utf8
@@ -246,24 +230,38 @@ index 5339454..45e07c0 100644
  ENDIF()
 
  # polyclipping
--IF(ASSIMP_HUNTER_ENABLED)
-+IF(0)
-   hunter_add_package(polyclipping)
-   find_package(polyclipping CONFIG REQUIRED)
- ELSE()
-@@ -930,8 +930,8 @@ ELSE()
- ENDIF()
+-#IF(ASSIMP_HUNTER_ENABLED)
++IF(1)
+ #  hunter_add_package(polyclipping)
+-#  find_package(polyclipping CONFIG REQUIRED)
+-#ELSE()
++  find_package(polyclipping CONFIG REQUIRED)
++ELSE()
+   SET( Clipper_SRCS
+     ../contrib/clipper/clipper.hpp
+     ../contrib/clipper/clipper.cpp
+   )
+   SOURCE_GROUP( Contrib\\Clipper FILES ${Clipper_SRCS})
+-#ENDIF()
++ENDIF()
 
  # poly2tri
--IF(ASSIMP_HUNTER_ENABLED)
--  hunter_add_package(poly2tri)
+-#IF(ASSIMP_HUNTER_ENABLED)
 +IF(1)
-+  #hunter_add_package(poly2tri)
-   find_package(poly2tri CONFIG REQUIRED)
- ELSE()
+ #  hunter_add_package(poly2tri)
+-#  find_package(poly2tri CONFIG REQUIRED)
+-#ELSE()
++  find_package(poly2tri CONFIG REQUIRED)
++ELSE()
    SET( Poly2Tri_SRCS
-@@ -951,8 +951,8 @@ ELSE()
- ENDIF()
+     ../contrib/poly2tri/poly2tri/common/shapes.cc
+     ../contrib/poly2tri/poly2tri/common/shapes.h
+@@ -957,11 +957,11 @@ ELSE()
+     ../contrib/poly2tri/poly2tri/sweep/sweep_context.h
+   )
+   SOURCE_GROUP( Contrib\\Poly2Tri FILES ${Poly2Tri_SRCS})
+-#ENDIF()
++ENDIF()
 
  # minizip/unzip
 -IF(ASSIMP_HUNTER_ENABLED)
@@ -377,13 +375,14 @@ index 5339454..45e07c0 100644
 +IF(1)
    TARGET_LINK_LIBRARIES(assimp
 -      PUBLIC
--      polyclipping::polyclipping
+-      #polyclipping::polyclipping
 -      openddlparser::openddl_parser
 +      PRIVATE
-+      #polyclipping::polyclipping
++      polyclipping::polyclipping
 +      #openddlparser::openddl_parser
 +      ${OPENDDL_PARSER_LIBRARIES}
-       poly2tri::poly2tri
+-      #poly2tri::poly2tri
++      poly2tri::poly2tri
        minizip::minizip
 -      ZLIB::zlib
 -      RapidJSON::rapidjson
@@ -463,17 +462,26 @@ index 5339454..45e07c0 100644
 
  # Add RT-extension library for glTF importer with Open3DGC-compression.
  IF (RT_FOUND AND ASSIMP_IMPORTER_GLTF_USE_OPEN3DGC)
--  TARGET_LINK_LIBRARIES(assimp ${RT_LIBRARY})
-+  TARGET_LINK_LIBRARIES(assimp PRIVATE ${RT_LIBRARY})
+-  TARGET_LINK_LIBRARIES(assimp rt)
++  TARGET_LINK_LIBRARIES(assimp PRIVATE rt)
  ENDIF ()
 
 
 diff --git a/code/Common/StbCommon.h b/code/Common/StbCommon.h
 index 1265d25..18f4564 100644
 --- a/code/Common/StbCommon.h
 +++ b/code/Common/StbCommon.h
-@@ -48,7 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #pragma GCC diagnostic ignored "-Wunused-function"
+@@ -53,7 +53,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #pragma clang diagnostic ignored "-Wunused-function"
+ #endif
+
+-#ifndef STB_USE_HUNTER
++#if 0
+ /*  Use prefixed names for the symbols from stb_image as it is a very commonly embedded library.
+     Including vanilla stb_image symbols causes duplicate symbol problems if assimp is linked
+     statically together with another library or executable that also embeds stb_image.
+@@ -111,7 +111,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #define stbi_zlib_decode_noheader_malloc assimp_stbi_zlib_decode_noheader_malloc
  #endif
 
 -#include "stb/stb_image.h"
@@ -507,3 +515,18 @@ index 3d5c72e..770cb9d 100644
  #endif
 
  namespace Assimp {
+diff --git a/include/assimp/types.h b/include/assimp/types.h
+index 72e3d5c..b9d770c 100644
+--- a/include/assimp/types.h
++++ b/include/assimp/types.h
+@@ -73,8 +73,8 @@
+
+ #ifdef __cplusplus
+
+-#ifdef ASSIMP_USE_HUNTER
+-#   include <utf8.h>
++#if 1
++//#   include <utf8.h>
+ #else
+ #   include "../contrib/utf8cpp/source/utf8.h"
+ #endif

ports/assimp/portfile.cmake

@@ -1,16 +1,16 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO assimp/assimp
-    REF v5.2.5
-    SHA512 ac0dc4243f9d1ff077966f0037187b4374075ac97e75e1a3cd6bdc1caf5f8e4d40953d9a8a316480969c09524d87daa9d3ed75e6ac6f037dd5b1c5f25fce3afb
+    REF v${VERSION}
+    SHA512 805842736a4129c5afec5327b04e9795e99a0252ef2bbafbd018cf4d3351fffd95a10f93348adb48f2765bd4264741b8a3888cfda27dda72ded21cc2c2c7bce5
     HEAD_REF master
     PATCHES
         build_fixes.patch
 )
 
 file(REMOVE "${SOURCE_PATH}/cmake-modules/FindZLIB.cmake")
 
-#file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper") # https://github.com/assimp/assimp/issues/788
+file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/clipper")
 file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/draco")
 file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/gtest")
 #file(REMOVE_RECURSE "${SOURCE_PATH}/contrib/Open3DGC")      #TODO
@@ -56,19 +56,34 @@ if(VCPKG_TARGET_IS_WINDOWS)
     endforeach()
 endif()
 
-find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH) 
+find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/lib" NO_DEFAULT_PATH)
 find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_PACKAGES_DIR}/debug/lib" NO_DEFAULT_PATH)
 if(ASSIMP_REL)
     get_filename_component(ASSIMP_NAME_REL "${ASSIMP_REL}" NAME_WLE)
+    string(REGEX REPLACE "^lib(.*)" "\\1" ASSIMP_NAME_REL "${ASSIMP_NAME_REL}")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_REL}")
 endif()
 if(ASSIMP_DBG)
     get_filename_component(ASSIMP_NAME_DBG "${ASSIMP_DBG}" NAME_WLE)
+    string(REGEX REPLACE "^lib(.*)" "\\1" ASSIMP_NAME_DBG "${ASSIMP_NAME_DBG}")
     vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "-lassimp" "-l${ASSIMP_NAME_DBG}")
 endif()
-vcpkg_fixup_pkgconfig() # Probably requires more fixing for static builds. See qt5-3d and the config changes below
+
+if("${VCPKG_LIBRARY_LINKAGE}" STREQUAL "static")
+    set(assimp_PC_REQUIRES "draco polyclipping pugixml minizip")
+    set(assimp_LIBS_REQUIRES "-lpoly2tri")
+
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "Libs:" "Requires.private: ${assimp_PC_REQUIRES}\nLibs:")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/lib/pkgconfig/assimp.pc" "Libs.private:" "Libs.private: ${assimp_LIBS_REQUIRES}")
+    if(NOT VCPKG_BUILD_TYPE)
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "Libs:" "Requires.private: ${assimp_PC_REQUIRES}\nLibs:")
+        vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/assimp.pc" "Libs.private:" "Libs.private: ${assimp_LIBS_REQUIRES}")
+    endif()
+endif()
+
+vcpkg_fixup_pkgconfig()
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
+vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")

ports/assimp/vcpkg.json

@@ -1,6 +1,6 @@
 {
   "name": "assimp",
-  "version": "5.2.5",
+  "version": "5.3.0",
   "description": "The Open Asset import library",
   "homepage": "https://github.com/assimp/assimp",
   "license": "BSD-3-Clause",
@@ -9,6 +9,7 @@
     "kubazip",
     "minizip",
     "poly2tri",
+    "polyclipping",
     "pugixml",
     "rapidjson",
     "stb",

ports/qt5-3d/portfile.cmake

@@ -1,53 +1,10 @@
-include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
+include("${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake")
 
 set(OPTIONS -system-assimp)
 
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(VCVER vc140 vc141 vc142 vc143 )
-    set(CRT mt md)
-    set(DBG_NAMES)
-    set(REL_NAMES)
-    foreach(_ver IN LISTS VCVER)
-        foreach(_crt IN LISTS CRT)
-            list(APPEND DBG_NAMES assimp-${_ver}-${_crt}d)
-            list(APPEND REL_NAMES assimp-${_ver}-${_crt})
-        endforeach()
-    endforeach()
-endif()
+x_vcpkg_pkgconfig_get_modules(PREFIX assimp MODULES assimp LIBS)
 
-find_library(ASSIMP_REL NAMES assimp ${REL_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(ASSIMP_DBG NAMES assimp assimpd ${DBG_NAMES} PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-
-find_library(MINIZIP_REL NAMES minizip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(MINIZIP_DBG NAMES minizip minizipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(KUBAZIP_REL NAMES kubazip PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(KUBAZIP_DBG NAMES kubazip kubazipd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(JPEG_REL NAMES jpeg jpeg-static PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(JPEG_DBG NAMES jpeg jpeg-static jpegd jpeg-staticd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(LIBPNG_REL NAMES png16 libpng16 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) #Depends on zlib
-find_library(LIBPNG_DBG NAMES png16 png16d libpng16 libpng16d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(ZLIB_REL NAMES z zlib PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(ZLIB_DBG NAMES z zlib zd zlibd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(PUGIXML_REL NAMES pugixml PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(PUGIXML_DBG NAMES pugixml pugixmld PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(POLY2TRI_REL NAMES poly2tri PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
-find_library(POLY2TRI_DBG NAMES poly2tri poly2trid PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-find_library(BZ2_REL bz2 PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
-find_library(BZ2_DBG bz2 bz2d PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
-if(BZ2_REL)
-    string(APPEND MINIZIP_REL " ${BZ2_REL}")
-endif()
-if(BZ2_DBG)
-    string(APPEND MINIZIP_DBG " ${BZ2_DBG}")
-endif()
-if(VCPKG_TARGET_IS_WINDOWS)
-    set(SYSTEM_LIBS "Advapi32.lib user32.lib gdi32.lib")
-elseif(VCPKG_TARGET_IS_OSX)
-    set(SYSTEM_LIBS "-framework OpenGL -framework Cocoa -framework Carbon -framework IOKit -framework AppKit")
-else()
-    set(SYSTEM_LIBS "-lGL -lXxf86vm -lX11")
-endif()
-set(OPT_REL "ASSIMP_LIBS=${ASSIMP_REL} ${PUGIXML_REL} ${POLY2TRI_REL} ${JPEG_REL} ${LIBPNG_REL} ${KUBAZIP_REL} ${MINIZIP_REL} ${ZLIB_REL} ${SYSTEM_LIBS}")
-set(OPT_DBG "ASSIMP_LIBS=${ASSIMP_DBG} ${PUGIXML_DBG} ${POLY2TRI_DBG} ${JPEG_DBG} ${LIBPNG_DBG} ${KUBAZIP_DBG} ${MINIZIP_DBG} ${ZLIB_DBG} ${SYSTEM_LIBS}")
+set(OPT_REL "ASSIMP_LIBS=${assimp_LIBS_RELEASE}")
+set(OPT_DBG "ASSIMP_LIBS=${assimp_LIBS_DEBUG}")
 
 qt_submodule_installation(BUILD_OPTIONS ${OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})