From 8b79653d726b3c5a86397f311ff40ec4d7075d29 Mon Sep 17 00:00:00 2001
From: Peter Petrik <zilolv@gmail.com>
Date: Wed, 23 Aug 2023 15:54:19 +0200
Subject: [PATCH] fix typo

---
 vcpkg-overlay/ports/gdal/portfile.cmake            |  4 +---
 .../ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake  | 14 +++++---------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/vcpkg-overlay/ports/gdal/portfile.cmake b/vcpkg-overlay/ports/gdal/portfile.cmake
index c60ae803..58856406 100644
--- a/vcpkg-overlay/ports/gdal/portfile.cmake
+++ b/vcpkg-overlay/ports/gdal/portfile.cmake
@@ -13,9 +13,6 @@ vcpkg_from_github(
 # `vcpkg clean` stumbles over one subdir
 file(REMOVE_RECURSE "${SOURCE_PATH}/autotest")
 
-list(APPEND FEATURE_OPTIONS -DGDAL_USE_JPEG_INTERNAL=OFF)
-list(APPEND FEATURE_OPTIONS -DGDAL_USE_JPEG=ON)
-
 list(APPEND FEATURE_OPTIONS -DGDAL_USE_PNG_INTERNAL=ON)
 list(APPEND FEATURE_OPTIONS -DGDAL_USE_JSONC_INTERNAL=ON)
 
@@ -35,6 +32,7 @@ list(APPEND FEATURE_OPTIONS -DGDAL_USE_SPATIALITE=ON)
 list(APPEND FEATURE_OPTIONS -DGDAL_USE_EXPAT=ON)
 list(APPEND FEATURE_OPTIONS -DGDAL_USE_ZLIB=ON)
 list(APPEND FEATURE_OPTIONS -DGDAL_USE_FREEXL=ON)
+list(APPEND FEATURE_OPTIONS -DGDAL_USE_JPEG=ON)
 
 list(APPEND FEATURE_OPTIONS -DGDAL_USE_POSTGRESQL=OFF)
 list(APPEND FEATURE_OPTIONS -DGDAL_USE_PCRE2=OFF)
diff --git a/vcpkg-overlay/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake b/vcpkg-overlay/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake
index 3ac2ed5d..28456a89 100644
--- a/vcpkg-overlay/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake
+++ b/vcpkg-overlay/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake
@@ -1,23 +1,19 @@
-find_path(JPEG_INCLUDE_DIR NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
+find_path(JPEG_INCLUDE_DIRS NAMES jpeglib.h PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include" NO_DEFAULT_PATH)
 find_library(JPEG_LIBRARY NAMES jpeg PATHS "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/lib" NO_DEFAULT_PATH)
 
 include(FindPackageHandleStandardArgs)
 find_package_handle_standard_args(
     JPEG
-    REQUIRED_VARS JPEG_LIBRARY JPEG_INCLUDE_DIR
+    REQUIRED_VARS JPEG_LIBRARY JPEG_INCLUDE_DIRS
 )
 
 if(JPEG_FOUND AND NOT TARGET JPEG::JPEG)
     add_library(JPEG::JPEG UNKNOWN IMPORTED)
-    if(DEFINED JPEG_INCLUDE_DIR)
-        set_target_properties(JPEG::JPEG PROPERTIES
-            INTERFACE_INCLUDE_DIRECTORIES "${JPEG_INCLUDE_DIR}")
-    endif()
-    if(EXISTS "${JPEG_LIBRARY}")
-        set_target_properties(JPEG::JPEG PROPERTIES
+    set_target_properties(JPEG::JPEG PROPERTIES
+            INTERFACE_INCLUDE_DIRECTORIES "${JPEG_INCLUDE_DIRS}")
+    set_target_properties(JPEG::JPEG PROPERTIES
             IMPORTED_LINK_INTERFACE_LANGUAGES "C"
             IMPORTED_LOCATION "${JPEG_LIBRARY}")
-    endif()
 
     set_target_properties(JPEG::JPEG PROPERTIES INTERFACE_COMPILE_OPTIONS "-DRENAME_INTERNAL_LIBJPEG_SYMBOLS")
 endif()
\ No newline at end of file