From 7f2ce2ba9ed1be02381b38c558b6e57862bb482a Mon Sep 17 00:00:00 2001 From: Eugene Shalygin Date: Wed, 2 May 2018 12:50:14 +0200 Subject: [PATCH] Rename targets and config files for consistency CMake does check both suffixes anyway (-config and Config), but since the project name is "libtorrent-rasterbar", the "-config" suffix looks better. --- CMakeLists.txt | 20 +++++++++---------- ...in => libtorrent-rasterbar-config.cmake.in | 2 +- 2 files changed, 10 insertions(+), 12 deletions(-) rename libtorrent-rasterbarConfig.cmake.in => libtorrent-rasterbar-config.cmake.in (90%) diff --git a/CMakeLists.txt b/CMakeLists.txt index fc43d7304..8281f3233 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -779,7 +779,7 @@ include(CheckCXXCompilerFlag) add_subdirectory(bindings) -install(TARGETS torrent-rasterbar EXPORT torrent-rasterbarTargets +install(TARGETS torrent-rasterbar EXPORT libtorrent-rasterbar-targets LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} @@ -799,26 +799,24 @@ else() endif() write_basic_package_version_file( - "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-config-version.cmake" VERSION ${libtorrent_VERSION} COMPATIBILITY ${_compatibility} ) -export(EXPORT torrent-rasterbarTargets - FILE "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarTargets.cmake" +export(EXPORT libtorrent-rasterbar-targets + FILE "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-targets.cmake" NAMESPACE Libtorrent:: ) -configure_package_config_file(libtorrent-rasterbarConfig.cmake.in - "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarConfig.cmake" +configure_package_config_file(libtorrent-rasterbar-config.cmake.in + "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-config.cmake" INSTALL_DESTINATION "${ConfigPackageLocation}" NO_SET_AND_CHECK_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO ) -install(EXPORT torrent-rasterbarTargets - FILE - libtorrent-rasterbarTargets.cmake +install(EXPORT libtorrent-rasterbar-targets NAMESPACE Libtorrent:: DESTINATION @@ -826,8 +824,8 @@ install(EXPORT torrent-rasterbarTargets ) install( FILES - "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarConfig.cmake" - "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarConfigVersion.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-config.cmake" + "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-config-version.cmake" DESTINATION ${ConfigPackageLocation} ) diff --git a/libtorrent-rasterbarConfig.cmake.in b/libtorrent-rasterbar-config.cmake.in similarity index 90% rename from libtorrent-rasterbarConfig.cmake.in rename to libtorrent-rasterbar-config.cmake.in index 6588609f0..2e359124f 100644 --- a/libtorrent-rasterbarConfig.cmake.in +++ b/libtorrent-rasterbar-config.cmake.in @@ -8,7 +8,7 @@ include(CMakeFindDependencyMacro) @_find_dependency_calls@ -include("${CMAKE_CURRENT_LIST_DIR}/libtorrent-rasterbarTargets.cmake") +include("${CMAKE_CURRENT_LIST_DIR}/libtorrent-rasterbar-targets.cmake") get_target_property(@PROJECT_NAME@_INCLUDE_DIRS Libtorrent::torrent-rasterbar INTERFACE_INCLUDE_DIRECTORIES) get_target_property(_lt_iface_link_libraries Libtorrent::torrent-rasterbar INTERFACE_LINK_LIBRARIES)