mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 19:39:00 +08:00
1d8133122b
* [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
79 lines
3.0 KiB
Diff
79 lines
3.0 KiB
Diff
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
|