From 1d8133122bff802f15ca4d515b5bb2ff68a3ff37 Mon Sep 17 00:00:00 2001 From: "Matthias C. M. Troffaes" Date: Fri, 11 Jun 2021 16:46:46 +0100 Subject: [openexr] fixup pkgconfig (#18123) * [openexr] fixup pkgconfig * [openexr] x-add-version * [openexr] drop _d library suffix for debug builds (ensures correct .pc file) * [openexr] x-add-version * [openexr] rename patches in order, add pkg-config debug suffix patch * [openexr] x-add-version * [openexr] update patch to match upstream PR * [openexr] x-add-version --- ports/openexr/0001-remove_find_package_macro.patch | 87 ++++++++++++++++++++++ ports/openexr/0002-fixup_cmake_exports_path.patch | 78 +++++++++++++++++++ ports/openexr/0003-remove_symlinks.patch | 40 ++++++++++ ...-config-lib-suffix-for-cmake-debug-builds.patch | 54 ++++++++++++++ ports/openexr/fixup_cmake_exports_path.patch | 78 ------------------- ports/openexr/portfile.cmake | 8 +- ports/openexr/remove_find_package_macro.patch | 87 ---------------------- ports/openexr/remove_symlinks.patch | 40 ---------- ports/openexr/vcpkg.json | 2 +- versions/baseline.json | 2 +- versions/o-/openexr.json | 5 ++ 11 files changed, 271 insertions(+), 210 deletions(-) create mode 100644 ports/openexr/0001-remove_find_package_macro.patch create mode 100644 ports/openexr/0002-fixup_cmake_exports_path.patch create mode 100644 ports/openexr/0003-remove_symlinks.patch create mode 100644 ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch delete mode 100644 ports/openexr/fixup_cmake_exports_path.patch delete mode 100644 ports/openexr/remove_find_package_macro.patch delete mode 100644 ports/openexr/remove_symlinks.patch diff --git a/ports/openexr/0001-remove_find_package_macro.patch b/ports/openexr/0001-remove_find_package_macro.patch new file mode 100644 index 000000000..967e89a83 --- /dev/null +++ b/ports/openexr/0001-remove_find_package_macro.patch @@ -0,0 +1,87 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 111a603..109394f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,22 +25,12 @@ endif() + project(OpenEXRMetaProject) + + +-# An "official" way to make this a super-project +-# basically overrides the find_package to not find anything +-# for stuff we're including locally +-set(as_subproject IlmBase OpenEXR) +-macro(find_package) +- if(NOT "${ARGV0}" IN_LIST as_subproject) +- _find_package(${ARGV}) +- endif() +-endmacro() +- + + # If you want to use ctest to configure, build and + # upload the results, cmake has builtin support for + # submitting to CDash, or any server who speaks the + # same protocol +-# ++# + # These settings will need to be set for your environment, + # and then a script such as the example in + # +@@ -51,7 +41,7 @@ endmacro() + # cmake -S cmake/SampleCTestScript.cmake + # + # [or whatever you name the file you edit] +-# ++# + #set(CTEST_PROJECT_NAME "OpenEXR") + #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC") + #set(CTEST_DROP_METHOD "http") # there are others... +diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt +index 390b27f..87b2d01 100644 +--- a/OpenEXR/CMakeLists.txt ++++ b/OpenEXR/CMakeLists.txt +@@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake) + + # Everyone depends on IlmBase, and we currently rely on + # the version matched with our release +-find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG) + + # generates config headers, package config files + add_subdirectory(config) +diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake +index 5116726..34c7c87 100644 +--- a/OpenEXR/config/OpenEXRSetup.cmake ++++ b/OpenEXR/config/OpenEXRSetup.cmake +@@ -33,7 +33,7 @@ endif() + # Whether to build & install the various command line utility programs + option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON) + +-# This is a variable here for use in controlling where include files are ++# This is a variable here for use in controlling where include files are + # installed. Care must be taken when changing this, as many things + # probably assume this is OpenEXR + set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install") +diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt +index 5efa353..5246fa7 100644 +--- a/OpenEXR_Viewers/CMakeLists.txt ++++ b/OpenEXR_Viewers/CMakeLists.txt +@@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION}) + ####################################### + include(config/OpenEXRViewersSetup.cmake) + +-find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) +-find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) + + # This is for newer cmake versions who know about vendor versions + set(OpenGL_GL_PREFERENCE GLVND) +diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt +index 291b96e..7d5074f 100644 +--- a/PyIlmBase/CMakeLists.txt ++++ b/PyIlmBase/CMakeLists.txt +@@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX) + include(config/PyIlmBaseSetup.cmake) + + # we have a strong dependence on IlmBase being an exact match +-find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG) + + # we are building a python extension, so of course we depend on + # python as well. Except we don't know which version... diff --git a/ports/openexr/0002-fixup_cmake_exports_path.patch b/ports/openexr/0002-fixup_cmake_exports_path.patch new file mode 100644 index 000000000..e39bd3792 --- /dev/null +++ b/ports/openexr/0002-fixup_cmake_exports_path.patch @@ -0,0 +1,78 @@ +diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt +index d9c5ae4..45ee6cc 100644 +--- a/IlmBase/config/CMakeLists.txt ++++ b/IlmBase/config/CMakeLists.txt +@@ -105,7 +105,7 @@ endif() + include(CMakePackageConfigHelpers) + configure_package_config_file(IlmBaseConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ INSTALL_DESTINATION share/ilmbase + ) + write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${ILMBASE_VERSION} +@@ -113,10 +113,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/ilmbase + ) + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/ilmbase + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES +diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt +index b52ad0d..3dc6d22 100644 +--- a/OpenEXR/config/CMakeLists.txt ++++ b/OpenEXR/config/CMakeLists.txt +@@ -19,7 +19,7 @@ int main() + sysconf(_SC_NPROCESSORS_ONLN); + } + " OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN +-) ++) + + check_cxx_source_compiles( + " +@@ -100,7 +100,7 @@ endif() + include(CMakePackageConfigHelpers) + configure_package_config_file(OpenEXRConfig.cmake.in + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake +- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ INSTALL_DESTINATION share/openexr + ) + write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + VERSION ${OPENEXR_VERSION} +@@ -108,10 +108,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake + ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/openexr + ) + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/openexr + FILE ${PROJECT_NAME}Targets.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES +diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt +index 1872c89..bc61f43 100644 +--- a/PyIlmBase/config/CMakeLists.txt ++++ b/PyIlmBase/config/CMakeLists.txt +@@ -39,10 +39,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" + COMPATIBILITY SameMajorVersion + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/pyilmbase + ) + install(EXPORT ${PROJECT_NAME} +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} ++ DESTINATION share/pyilmbase + FILE ${PROJECT_NAME}Config.cmake + NAMESPACE ${PROJECT_NAME}:: + EXPORT_LINK_INTERFACE_LIBRARIES diff --git a/ports/openexr/0003-remove_symlinks.patch b/ports/openexr/0003-remove_symlinks.patch new file mode 100644 index 000000000..89b9c53f3 --- /dev/null +++ b/ports/openexr/0003-remove_symlinks.patch @@ -0,0 +1,40 @@ +diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake +index 44254a7..1f5d2a6 100644 +--- a/IlmBase/config/LibraryDefine.cmake ++++ b/IlmBase/config/LibraryDefine.cmake +@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname) + if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- if(WIN32) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") +- else() +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") +- endif() +- set(verlibname) +- set(baselibname) + endif() + + if(ILMBASE_BUILD_BOTH_STATIC_SHARED) +diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake +index a9561dc..42853af 100644 +--- a/OpenEXR/config/LibraryDefine.cmake ++++ b/OpenEXR/config/LibraryDefine.cmake +@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname) + if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) + set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) +- if(WIN32) +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") +- else() +- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") +- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")") +- endif() +- set(verlibname) +- set(baselibname) + endif() + + if(OPENEXR_BUILD_BOTH_STATIC_SHARED) diff --git a/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch b/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch new file mode 100644 index 000000000..83ab73a21 --- /dev/null +++ b/ports/openexr/0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch @@ -0,0 +1,54 @@ +From 6cd6b32af052563e4cd5114a1d279736d1d8653a Mon Sep 17 00:00:00 2001 +From: "Matthias C. M. Troffaes" +Date: Tue, 1 Jun 2021 08:06:45 +0100 +Subject: [PATCH] Use CMAKE__POSTFIX for .pc file lib suffix. + +Signed-off-by: Matthias C. M. Troffaes +--- + IlmBase/config/CMakeLists.txt | 3 ++- + OpenEXR/config/CMakeLists.txt | 3 ++- + PyIlmBase/config/CMakeLists.txt | 3 ++- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt +index d9c5ae449..dfebb43bd 100644 +--- a/IlmBase/config/CMakeLists.txt ++++ b/IlmBase/config/CMakeLists.txt +@@ -78,7 +78,8 @@ if(ILMBASE_INSTALL_PKG_CONFIG) + set(exec_prefix "\${prefix}") + set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +- set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}) ++ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) ++ set(LIB_SUFFIX_DASH ${ILMBASE_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions + # which don't seem to evaluate +diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt +index 8386e3a0e..039190cd9 100644 +--- a/OpenEXR/config/CMakeLists.txt ++++ b/OpenEXR/config/CMakeLists.txt +@@ -77,7 +77,8 @@ if(OPENEXR_INSTALL_PKG_CONFIG) + set(exec_prefix "\${prefix}") + set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}") + set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}") +- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) ++ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) ++ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) + if(TARGET Threads::Threads) + # hrm, can't use properties as they end up as generator expressions + # which don't seem to evaluate +diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt +index 1872c89e7..a4139bcfd 100644 +--- a/PyIlmBase/config/CMakeLists.txt ++++ b/PyIlmBase/config/CMakeLists.txt +@@ -18,7 +18,8 @@ if(PYILMBASE_INSTALL_PKG_CONFIG) + set(exec_prefix ${CMAKE_INSTALL_BINDIR}) + set(libdir ${CMAKE_INSTALL_LIBDIR}) + set(includedir ${CMAKE_INSTALL_INCLUDEDIR}) +- set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}) ++ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE) ++ set(LIB_SUFFIX_DASH ${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}) + string(REPLACE ".in" "" pcout ${pcinfile}) + configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY) + install( diff --git a/ports/openexr/fixup_cmake_exports_path.patch b/ports/openexr/fixup_cmake_exports_path.patch deleted file mode 100644 index e39bd3792..000000000 --- a/ports/openexr/fixup_cmake_exports_path.patch +++ /dev/null @@ -1,78 +0,0 @@ -diff --git a/IlmBase/config/CMakeLists.txt b/IlmBase/config/CMakeLists.txt -index d9c5ae4..45ee6cc 100644 ---- a/IlmBase/config/CMakeLists.txt -+++ b/IlmBase/config/CMakeLists.txt -@@ -105,7 +105,7 @@ endif() - include(CMakePackageConfigHelpers) - configure_package_config_file(IlmBaseConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION share/ilmbase - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${ILMBASE_VERSION} -@@ -113,10 +113,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/ilmbase - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/ilmbase - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/OpenEXR/config/CMakeLists.txt b/OpenEXR/config/CMakeLists.txt -index b52ad0d..3dc6d22 100644 ---- a/OpenEXR/config/CMakeLists.txt -+++ b/OpenEXR/config/CMakeLists.txt -@@ -19,7 +19,7 @@ int main() - sysconf(_SC_NPROCESSORS_ONLN); - } - " OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN --) -+) - - check_cxx_source_compiles( - " -@@ -100,7 +100,7 @@ endif() - include(CMakePackageConfigHelpers) - configure_package_config_file(OpenEXRConfig.cmake.in - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake -- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ INSTALL_DESTINATION share/openexr - ) - write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${OPENEXR_VERSION} -@@ -108,10 +108,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/openexr - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/openexr - FILE ${PROJECT_NAME}Targets.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES -diff --git a/PyIlmBase/config/CMakeLists.txt b/PyIlmBase/config/CMakeLists.txt -index 1872c89..bc61f43 100644 ---- a/PyIlmBase/config/CMakeLists.txt -+++ b/PyIlmBase/config/CMakeLists.txt -@@ -39,10 +39,10 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake" - COMPATIBILITY SameMajorVersion - ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/pyilmbase - ) - install(EXPORT ${PROJECT_NAME} -- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} -+ DESTINATION share/pyilmbase - FILE ${PROJECT_NAME}Config.cmake - NAMESPACE ${PROJECT_NAME}:: - EXPORT_LINK_INTERFACE_LIBRARIES diff --git a/ports/openexr/portfile.cmake b/ports/openexr/portfile.cmake index d73520cea..aac8fea55 100644 --- a/ports/openexr/portfile.cmake +++ b/ports/openexr/portfile.cmake @@ -9,9 +9,10 @@ vcpkg_from_github( SHA512 549d37ed1ef4d1ff7e732d583f7213ee15c7f92625aea9fd65345e4c5b854902c02e5940d0692b1af5ae0a02abf46aaefea2662db2389d1b2fb4264a373baac2 HEAD_REF master PATCHES - remove_find_package_macro.patch - fixup_cmake_exports_path.patch - remove_symlinks.patch + 0001-remove_find_package_macro.patch + 0002-fixup_cmake_exports_path.patch + 0003-remove_symlinks.patch + 0004-Fix-pkg-config-lib-suffix-for-cmake-debug-builds.patch # https://github.com/AcademySoftwareFoundation/openexr/pull/1032 ) vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} @@ -25,6 +26,7 @@ vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH share/ilmbase TARGET_PATH share/ilmbase) vcpkg_fixup_cmake_targets() +vcpkg_fixup_pkgconfig() file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrenvmap${VCPKG_HOST_EXECUTABLE_SUFFIX}) file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/exrheader${VCPKG_HOST_EXECUTABLE_SUFFIX}) diff --git a/ports/openexr/remove_find_package_macro.patch b/ports/openexr/remove_find_package_macro.patch deleted file mode 100644 index 967e89a83..000000000 --- a/ports/openexr/remove_find_package_macro.patch +++ /dev/null @@ -1,87 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 111a603..109394f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,22 +25,12 @@ endif() - project(OpenEXRMetaProject) - - --# An "official" way to make this a super-project --# basically overrides the find_package to not find anything --# for stuff we're including locally --set(as_subproject IlmBase OpenEXR) --macro(find_package) -- if(NOT "${ARGV0}" IN_LIST as_subproject) -- _find_package(${ARGV}) -- endif() --endmacro() -- - - # If you want to use ctest to configure, build and - # upload the results, cmake has builtin support for - # submitting to CDash, or any server who speaks the - # same protocol --# -+# - # These settings will need to be set for your environment, - # and then a script such as the example in - # -@@ -51,7 +41,7 @@ endmacro() - # cmake -S cmake/SampleCTestScript.cmake - # - # [or whatever you name the file you edit] --# -+# - #set(CTEST_PROJECT_NAME "OpenEXR") - #set(CTEST_NIGHTLY_START_TIME "01:01:01 UTC") - #set(CTEST_DROP_METHOD "http") # there are others... -diff --git a/OpenEXR/CMakeLists.txt b/OpenEXR/CMakeLists.txt -index 390b27f..87b2d01 100644 ---- a/OpenEXR/CMakeLists.txt -+++ b/OpenEXR/CMakeLists.txt -@@ -35,7 +35,6 @@ include(config/OpenEXRSetup.cmake) - - # Everyone depends on IlmBase, and we currently rely on - # the version matched with our release --find_package(IlmBase ${OPENEXR_VERSION} EXACT REQUIRED CONFIG) - - # generates config headers, package config files - add_subdirectory(config) -diff --git a/OpenEXR/config/OpenEXRSetup.cmake b/OpenEXR/config/OpenEXRSetup.cmake -index 5116726..34c7c87 100644 ---- a/OpenEXR/config/OpenEXRSetup.cmake -+++ b/OpenEXR/config/OpenEXRSetup.cmake -@@ -33,7 +33,7 @@ endif() - # Whether to build & install the various command line utility programs - option(OPENEXR_BUILD_UTILS "Enables building of utility programs" ON) - --# This is a variable here for use in controlling where include files are -+# This is a variable here for use in controlling where include files are - # installed. Care must be taken when changing this, as many things - # probably assume this is OpenEXR - set(OPENEXR_OUTPUT_SUBDIR OpenEXR CACHE STRING "Destination sub-folder of the include path for install") -diff --git a/OpenEXR_Viewers/CMakeLists.txt b/OpenEXR_Viewers/CMakeLists.txt -index 5efa353..5246fa7 100644 ---- a/OpenEXR_Viewers/CMakeLists.txt -+++ b/OpenEXR_Viewers/CMakeLists.txt -@@ -24,8 +24,6 @@ project(OpenEXR_Viewers VERSION ${OPENEXR_VIEWERS_VERSION}) - ####################################### - include(config/OpenEXRViewersSetup.cmake) - --find_package(IlmBase ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) --find_package(OpenEXR ${OPENEXR_VIEWERS_VERSION} EXACT REQUIRED CONFIG) - - # This is for newer cmake versions who know about vendor versions - set(OpenGL_GL_PREFERENCE GLVND) -diff --git a/PyIlmBase/CMakeLists.txt b/PyIlmBase/CMakeLists.txt -index 291b96e..7d5074f 100644 ---- a/PyIlmBase/CMakeLists.txt -+++ b/PyIlmBase/CMakeLists.txt -@@ -27,7 +27,6 @@ project(PyIlmBase VERSION ${PYILMBASE_VERSION} LANGUAGES C CXX) - include(config/PyIlmBaseSetup.cmake) - - # we have a strong dependence on IlmBase being an exact match --find_package(IlmBase ${PYILMBASE_VERSION} EXACT REQUIRED CONFIG) - - # we are building a python extension, so of course we depend on - # python as well. Except we don't know which version... diff --git a/ports/openexr/remove_symlinks.patch b/ports/openexr/remove_symlinks.patch deleted file mode 100644 index 89b9c53f3..000000000 --- a/ports/openexr/remove_symlinks.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/IlmBase/config/LibraryDefine.cmake b/IlmBase/config/LibraryDefine.cmake -index 44254a7..1f5d2a6 100644 ---- a/IlmBase/config/LibraryDefine.cmake -+++ b/IlmBase/config/LibraryDefine.cmake -@@ -101,15 +101,6 @@ function(ILMBASE_DEFINE_LIBRARY libname) - if(BUILD_SHARED_LIBS AND (NOT "${ILMBASE_LIB_SUFFIX}" STREQUAL "")) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${ILMBASE_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(WIN32) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") -- else() -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")") -- endif() -- set(verlibname) -- set(baselibname) - endif() - - if(ILMBASE_BUILD_BOTH_STATIC_SHARED) -diff --git a/OpenEXR/config/LibraryDefine.cmake b/OpenEXR/config/LibraryDefine.cmake -index a9561dc..42853af 100644 ---- a/OpenEXR/config/LibraryDefine.cmake -+++ b/OpenEXR/config/LibraryDefine.cmake -@@ -95,15 +95,6 @@ function(OPENEXR_DEFINE_LIBRARY libname) - if(BUILD_SHARED_LIBS AND (NOT "${OPENEXR_LIB_SUFFIX}" STREQUAL "")) - set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_SHARED_LIBRARY_SUFFIX}) - set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_SHARED_LIBRARY_SUFFIX}) -- if(WIN32) -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_BINDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_BINDIR} ${baselibname} -> ${verlibname}\")") -- else() -- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})") -- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")") -- endif() -- set(verlibname) -- set(baselibname) - endif() - - if(OPENEXR_BUILD_BOTH_STATIC_SHARED) diff --git a/ports/openexr/vcpkg.json b/ports/openexr/vcpkg.json index 1d7f178bf..b293e7047 100644 --- a/ports/openexr/vcpkg.json +++ b/ports/openexr/vcpkg.json @@ -1,7 +1,7 @@ { "name": "openexr", "version-string": "2.5.0", - "port-version": 2, + "port-version": 3, "description": "OpenEXR is a high dynamic-range (HDR) image file format developed by Industrial Light & Magic for use in computer imaging applications", "homepage": "https://www.openexr.com/", "supports": "!uwp", diff --git a/versions/baseline.json b/versions/baseline.json index 51c4ce874..576a78280 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4538,7 +4538,7 @@ }, "openexr": { "baseline": "2.5.0", - "port-version": 2 + "port-version": 3 }, "opengl": { "baseline": "0.0", diff --git a/versions/o-/openexr.json b/versions/o-/openexr.json index c846a69c6..06c0f7620 100644 --- a/versions/o-/openexr.json +++ b/versions/o-/openexr.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "7589d3f1641e6e63450303e424d966221375109f", + "version-string": "2.5.0", + "port-version": 3 + }, { "git-tree": "42bec4d0daed751ad449a504b7fa43d57eec9000", "version-string": "2.5.0", -- cgit v1.2.3