Skip to content

Commit 36978ec

Browse files
committed
Eliminated repipitions of CMake config file for Lyra (that were the source of the previous mistake) by introducing a variable LYRA_INSTALL_CONFIGDIR
1 parent c8a1a5f commit 36978ec

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,15 @@ target_include_directories(
5959
# Add an alias to public name.
6060
add_library( bfg::lyra ALIAS lyra )
6161

62+
set(LYRA_INSTALL_CONFIGDIR "${CMAKE_INSTALL_DATADIR}/lyra/cmake")
6263
set(PkgConfigTemplatesDir "${CMAKE_CURRENT_SOURCE_DIR}/data/pkgconfig")
6364

6465
## Installation Code
6566
include(CMakePackageConfigHelpers)
6667
configure_package_config_file(
6768
${PROJECT_SOURCE_DIR}/data/cmake/lyraConfig.cmake.in
6869
${PROJECT_BINARY_DIR}/lyraConfig.cmake
69-
INSTALL_DESTINATION ${CMAKE_INSTALL_DATADIR}/lyra/cmake
70+
INSTALL_DESTINATION "${LYRA_INSTALL_CONFIGDIR}"
7071
)
7172

7273
install(
@@ -78,7 +79,7 @@ install(
7879
EXPORT lyraTarget
7980
FILE lyraTarget.cmake
8081
NAMESPACE bfg::
81-
DESTINATION ${CMAKE_INSTALL_DATADIR}/lyra/cmake
82+
DESTINATION "${LYRA_INSTALL_CONFIGDIR}"
8283
)
8384

8485
install(
@@ -89,7 +90,7 @@ install(
8990
install(
9091
FILES
9192
${PROJECT_BINARY_DIR}/lyraConfig.cmake
92-
DESTINATION ${CMAKE_INSTALL_DATADIR}/lyra/cmake
93+
DESTINATION "${LYRA_INSTALL_CONFIGDIR}"
9394
)
9495

9596
set(PKG_CONFIG_FILE_NAME "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc")

0 commit comments

Comments
 (0)