restrict package finding to flatpak only

deps/CMakeLists.txt

@@ -42,8 +42,8 @@ endif ()
 
 set(DESTDIR "${CMAKE_CURRENT_BINARY_DIR}/destdir" CACHE PATH "Destination directory")
 set(DEP_DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../DL_CACHE CACHE PATH "Path for downloaded source packages.")
-set(REMOVE_DESTDIR_POSTPEND FALSE CACHE BOOL "Used in flatpak to remove the '/usr/local' ending in destdir")
-if (NOT REMOVE_DESTDIR_POSTPEND)
+set(FLATPAK FALSE CACHE BOOL "Toggles /usr/local path for building deps, the flatpak just shoves everything into /app")
+if (NOT FLATPAK)
     set(DESTDIR "${DESTDIR}/usr/local/")
 endif()
 
@@ -208,20 +208,28 @@ else()
     include("deps-linux.cmake")
 endif()
 
+if(FLATPAK)
+    # flatpak bundles some deps with the layer, so attempt to find them first
+    find_package(ZLIB)
+    find_package(PNG)
+    find_package(EXPAT)
+    find_package(CURL)
+    find_package(JPEG)
+    find_package(TIFF)
+    find_package(Freetype)
+endif()
+
 set(ZLIB_PKG "")
-find_package(ZLIB)
 if (NOT ZLIB_FOUND) 
     include(ZLIB/ZLIB.cmake)
     set(ZLIB_PKG dep_ZLIB)
 endif ()
 set(PNG_PKG "")
-find_package(PNG)
 if (NOT PNG_FOUND) 
     include(PNG/PNG.cmake)
     set(PNG_PKG dep_PNG)
 endif ()
 set(EXPAT_PKG "")
-find_package(EXPAT)
 if (NOT EXPAT_FOUND) 
     include(EXPAT/EXPAT.cmake)
     set(EXPAT_PKG dep_EXPAT)
@@ -251,7 +259,6 @@ include(CGAL/CGAL.cmake)
 include(NLopt/NLopt.cmake)
 
 set(CURL_PKG "")
-find_package(CURL)
 if (NOT CURL_FOUND)
     message(WARNING "no curl package found, building openssl and curl")
     include(OpenSSL/OpenSSL.cmake)
@@ -261,14 +268,12 @@ if (NOT CURL_FOUND)
 endif ()
 
 set(JPEG_PKG "")
-find_package(JPEG)
 if (NOT JPEG_FOUND)
     include(JPEG/JPEG.cmake)
     set(JPEG_PKG dep_JPEG)
 endif()
 
 set(TIFF_PKG "")
-find_package(TIFF)
 if (NOT TIFF_FOUND)
     include(TIFF/TIFF.cmake)
     set(TIFF_PKG "dep_TIFF")
@@ -277,7 +282,6 @@ endif()
 include(wxWidgets/wxWidgets.cmake)
 
 set(FREETYPE_PKG "")
-find_package(Freetype)
 if(NOT FREETYPE_FOUND)
     include(FREETYPE/FREETYPE.cmake)
     set(FREETYPE_PKG "dep_FREETYPE")