jasper depends on freeglut so add it as a dependency. turbo_jpeg is a…

…lso a dependency but that should already be handled in qt5-base
microsoft · Oct 14, 2019 · d0f1917 · d0f1917
1 parent f1e3e10
commit d0f1917
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/ports/qt5-imageformats/portfile.cmake b/ports/qt5-imageformats/portfile.cmake
@@ -5,15 +5,18 @@ include(${CURRENT_INSTALLED_DIR}/share/qt5/qt_port_functions.cmake)
 list(APPEND CORE_OPTIONS
     -system-tiff
     -system-webp
-    -jasper
+    -jasper 
+    -no-mng # must be explicitly disabled to not automatically pick up mng
     -verbose)
 
 find_library(TIFF_RELEASE NAMES tiff PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on lzma
 find_library(TIFF_DEBUG NAMES tiffd PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
 
 
-find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) # Depends on lzma
+find_library(JASPER_RELEASE NAMES jasper PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
 find_library(JASPER_DEBUG NAMES jasperd jasper libjasperd libjasper PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
+find_library(FREEGLUT_RELEASE NAMES freeglut PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH)
+find_library(FREEGLUT_DEBUG NAMES freeglutd freeglut PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
 
 find_library(WEBP_RELEASE NAMES webp PATHS "${CURRENT_INSTALLED_DIR}/lib" NO_DEFAULT_PATH) 
 find_library(WEBP_DEBUG NAMES webpd webp PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO_DEFAULT_PATH)
@@ -28,8 +31,8 @@ find_library(LZMA_DEBUG lzmad lzma PATHS "${CURRENT_INSTALLED_DIR}/debug/lib" NO
 
 set(OPT_REL "TIFF_LIBS=${TIFF_RELEASE} ${LZMA_RELEASE}"
             "WEBP_LIBS=${WEBP_RELEASE} ${WEBPDEMUX_RELEASE}"
-            "JASPER_LIBS=${JASPER_RELEASE}")
+            "JASPER_LIBS=${JASPER_RELEASE} ${FREEGLUT_RELEASE}")
 set(OPT_DBG "TIFF_LIBS=${TIFF_DEBUG} ${LZMA_DEBUG}"
             "WEBP_LIBS=${WEBP_DEBUG} ${WEBPDEMUX_DEBUG}"
-            "JASPER_LIBS=${JASPER_DEBUG}")
+            "JASPER_LIBS=${JASPER_DEBUG} ${FREEGLUT_DEBUG}")
 qt_submodule_installation(BUILD_OPTIONS ${CORE_OPTIONS} BUILD_OPTIONS_RELEASE ${OPT_REL} BUILD_OPTIONS_DEBUG ${OPT_DBG})