diff options
| author | James Zern <jzern@google.com> | 2023-05-16 17:36:02 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2023-05-16 17:39:50 -0700 |
| commit | cba300781f4eea9dd957990c6db3977718d4338a (patch) | |
| tree | 516af7daf77e78aab85660065c8ff2cfa1f2c3f2 | |
| parent | 6cf9a76ae219e245611a676d81fd952d78a400b6 (diff) | |
| download | libwebp-main.tar.gz | |
when setting WebP_INCLUDE_DIRS; this value is relative to the
WebPConfig.cmake install location (${PACKAGE_PREFIX_DIR}/include) and
allows the install to be relocated after creation.
See also:
https://cmake.org/cmake/help/latest/module/CMakePackageConfigHelpers.html#example-generating-package-files
Bug: webp:610
Change-Id: If877625e96584a9808b0bba902e3f0b2a744aa60
Fixed: webp:610
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | cmake/WebPConfig.cmake.in | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b7e8bf6a..21f0eae2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -743,7 +743,8 @@ endif() configure_package_config_file( ${CMAKE_CURRENT_SOURCE_DIR}/cmake/WebPConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/WebPConfig.cmake - INSTALL_DESTINATION ${ConfigPackageLocation}) + INSTALL_DESTINATION ${ConfigPackageLocation} + PATH_VARS CMAKE_INSTALL_INCLUDEDIR) # Install the generated CMake files. install(FILES "${CMAKE_CURRENT_BINARY_DIR}/WebPConfigVersion.cmake" diff --git a/cmake/WebPConfig.cmake.in b/cmake/WebPConfig.cmake.in index f3347394..c091b4ef 100644 --- a/cmake/WebPConfig.cmake.in +++ b/cmake/WebPConfig.cmake.in @@ -10,7 +10,9 @@ endif() include ("${CMAKE_CURRENT_LIST_DIR}/@PROJECT_NAME@Targets.cmake") -set(WebP_INCLUDE_DIRS "@CMAKE_INSTALL_FULL_INCLUDEDIR@") +set_and_check(WebP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") set(WEBP_INCLUDE_DIRS ${WebP_INCLUDE_DIRS}) set(WebP_LIBRARIES "@INSTALLED_LIBRARIES@") set(WEBP_LIBRARIES "${WebP_LIBRARIES}") + +check_required_components(WebP) |