Skip to content

Commit

Permalink
fix typo
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterPetrik committed Aug 23, 2023
1 parent 4414f4e commit 8b79653
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
4 changes: 1 addition & 3 deletions vcpkg-overlay/ports/gdal/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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)
Expand Down
14 changes: 5 additions & 9 deletions vcpkg-overlay/ports/libjpeg-turbo/vcpkg-cmake-wrapper.cmake
Original file line number Diff line number Diff line change
@@ -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()

0 comments on commit 8b79653

Please sign in to comment.