diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2019-02-26 08:16:20 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-26 08:16:20 -0800 |
| commit | bd94d1e254aede85506e07a632d1a7aafd538115 (patch) | |
| tree | 3b99452b7346175aca0d514dafc8324eb07364b8 /ports/freeimage/cmake | |
| parent | ecff2997f686d9169e3d088541fda7aa2ea62011 (diff) | |
| download | vcpkg-bd94d1e254aede85506e07a632d1a7aafd538115.tar.gz vcpkg-bd94d1e254aede85506e07a632d1a7aafd538115.zip | |
[freeimage, libwebp, OpenEXR, OpenVDB] Updates (#5417)
* [libwebp] update to v1.0.2, greatly simplify port, remove unnecessary custom find_package script in favour of original Config files for cmake
* [libwebp] enable building of all tools
* [libwebp] install cmake config file in expected path
* [libwebp] add compatibility layer inside CMake Config file
* [libwebp] fix libwebpmux library name
* [OpenEXR] Update to v2.3.0, enable tools, improve cmake module while still maintaining backwards compatibility (there's an official one distributed with the package but it is completely different, for now it is avoided)
* [OpenEXR] remove unused patches
* [OpenEXR] remove forced definition, could hide problems downstream
* [freeimage] add compatibility with latest OpenEXR
* [freeimage] bump control
* [OpenEXR] restore ilmbase as an empty package to permit clean update
* [OpenVDB] update to v6.0
* [OpenEXR] disable building on UWP platform
* [openexr] Fix tools suffixes
* [openexr] Fix Linux build paths
Diffstat (limited to 'ports/freeimage/cmake')
| -rw-r--r-- | ports/freeimage/cmake/FindJXR.cmake | 28 | ||||
| -rw-r--r-- | ports/freeimage/cmake/FindOpenEXR.cmake | 28 | ||||
| -rw-r--r-- | ports/freeimage/cmake/FindWEBP.cmake | 26 |
3 files changed, 0 insertions, 82 deletions
diff --git a/ports/freeimage/cmake/FindJXR.cmake b/ports/freeimage/cmake/FindJXR.cmake deleted file mode 100644 index 7e4a5d45e..000000000 --- a/ports/freeimage/cmake/FindJXR.cmake +++ /dev/null @@ -1,28 +0,0 @@ -# - Find JXR -# Find the JXR library -# This module defines -# JXR_INCLUDE_DIRS, where to find jxrlib/JXRGlue.h -# JXR_LIBRARIES, the libraries needed to use JXR -# - -find_path(JXR_INCLUDE_DIRS - NAMES JXRGlue.h - PATH_SUFFIXES jxrlib -) -mark_as_advanced(JXR_INCLUDE_DIRS) - -include(SelectLibraryConfigurations) - -find_library(JPEGXR_LIBRARY_RELEASE NAMES jpegxr PATH_SUFFIXES lib) -find_library(JPEGXR_LIBRARY_DEBUG NAMES jpegxrd PATH_SUFFIXES lib) -select_library_configurations(JPEGXR) - -find_library(JXRGLUE_LIBRARY_RELEASE NAMES jxrglue PATH_SUFFIXES lib) -find_library(JXRGLUE_LIBRARY_DEBUG NAMES jxrglued PATH_SUFFIXES lib) -select_library_configurations(JXRGLUE) - -set(JXR_LIBRARIES ${JPEGXR_LIBRARY} ${JXRGLUE_LIBRARY}) -mark_as_advanced(JXR_LIBRARIES) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(JXR DEFAULT_MSG JXR_INCLUDE_DIRS JXR_LIBRARIES) diff --git a/ports/freeimage/cmake/FindOpenEXR.cmake b/ports/freeimage/cmake/FindOpenEXR.cmake deleted file mode 100644 index beca25145..000000000 --- a/ports/freeimage/cmake/FindOpenEXR.cmake +++ /dev/null @@ -1,28 +0,0 @@ -find_path(OpenEXR_INCLUDE_DIRS OpenEXR/OpenEXRConfig.h) - -file(STRINGS "${OpenEXR_INCLUDE_DIRS}/OpenEXR/OpenEXRConfig.h" OPENEXR_CONFIG_H) - -string(REGEX REPLACE "^.*define OPENEXR_VERSION_MAJOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MAJOR "${OPENEXR_CONFIG_H}") -string(REGEX REPLACE "^.*define OPENEXR_VERSION_MINOR ([0-9]+).*$" "\\1" OpenEXR_VERSION_MINOR "${OPENEXR_CONFIG_H}") -set(OpenEXR_LIB_SUFFIX "${OpenEXR_VERSION_MAJOR}_${OpenEXR_VERSION_MINOR}") - -find_library(OpenEXR_LIBRARY IlmImf-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_UTIL_LIBRARY IlmImfUtil-${OpenEXR_LIB_SUFFIX}) - -find_library(OpenEXR_HALF_LIBRARY Half) -find_library(OpenEXR_IEX_LIBRARY Iex-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_THREAD_LIBRARY IlmThread-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_IEXMATH_LIBRARY IexMath-${OpenEXR_LIB_SUFFIX}) -find_library(OpenEXR_MATH_LIBRARY Imath-${OpenEXR_LIB_SUFFIX}) - -set(OpenEXR_LIBRARIES - ${OpenEXR_LIBRARY} - ${OpenEXR_MATH_LIBRARY} - ${OpenEXR_IEXMATH_LIBRARY} - ${OpenEXR_UTIL_LIBRARY} - ${OpenEXR_HALF_LIBRARY} - ${OpenEXR_IEX_LIBRARY} - ${OpenEXR_THREAD_LIBRARY}) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenEXR REQUIRED_VARS OpenEXR_LIBRARIES OpenEXR_INCLUDE_DIRS) diff --git a/ports/freeimage/cmake/FindWEBP.cmake b/ports/freeimage/cmake/FindWEBP.cmake deleted file mode 100644 index b4fefeadc..000000000 --- a/ports/freeimage/cmake/FindWEBP.cmake +++ /dev/null @@ -1,26 +0,0 @@ -# - Find WEBP -# Find the WEBP library -# This module defines -# WEBP_INCLUDE_DIRS, where to find webp/decode.h -# WEBP_LIBRARIES, the libraries needed to use WEBP -# - -find_path(WEBP_INCLUDE_DIRS - NAMES webp/decode.h -) -mark_as_advanced(WEBP_INCLUDE_DIRS) - -find_library(WEBP_LIBRARY_RELEASE NAMES webp PATH_SUFFIXES lib) -find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATH_SUFFIXES lib) - -find_library(WEBPMUX_LIBRARY_RELEASE NAMES webpmux PATH_SUFFIXES lib) -find_library(WEBPMUX_LIBRARY_DEBUG NAMES webpmuxd PATH_SUFFIXES lib) - -include(SelectLibraryConfigurations) -select_library_configurations(WEBP) -select_library_configurations(WEBPMUX) - -set(WEBP_LIBRARIES ${WEBPMUX_LIBRARY} ${WEBP_LIBRARY}) - -include(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES) |
