premiere
/
premiere-libtorrent
2
2
Fork 1
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Eugene Shalygin 2018-05-02 12:50:14 +02:00 committed by Arvid Norberg
parent 8b87b42a5a
commit 7f2ce2ba9e
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
CMakeLists.txt
View File

@ -779,7 +779,7 @@ include(CheckCXXCompilerFlag)
add_subdirectory(bindings) add_subdirectory(bindings)
install(TARGETS torrent-rasterbar EXPORT torrent-rasterbarTargets install(TARGETS torrent-rasterbar EXPORT libtorrent-rasterbar-targets
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@ -799,26 +799,24 @@ else()
endif() endif()
write_basic_package_version_file( 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} VERSION ${libtorrent_VERSION}
COMPATIBILITY ${_compatibility} COMPATIBILITY ${_compatibility}
) )
export(EXPORT torrent-rasterbarTargets export(EXPORT libtorrent-rasterbar-targets
FILE "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarTargets.cmake" FILE "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-targets.cmake"
NAMESPACE Libtorrent:: NAMESPACE Libtorrent::
) )
configure_package_config_file(libtorrent-rasterbarConfig.cmake.in configure_package_config_file(libtorrent-rasterbar-config.cmake.in
"${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-config.cmake"
INSTALL_DESTINATION "${ConfigPackageLocation}" INSTALL_DESTINATION "${ConfigPackageLocation}"
NO_SET_AND_CHECK_MACRO NO_SET_AND_CHECK_MACRO
NO_CHECK_REQUIRED_COMPONENTS_MACRO NO_CHECK_REQUIRED_COMPONENTS_MACRO
) )
install(EXPORT torrent-rasterbarTargets install(EXPORT libtorrent-rasterbar-targets
FILE
libtorrent-rasterbarTargets.cmake
NAMESPACE NAMESPACE
Libtorrent:: Libtorrent::
DESTINATION DESTINATION
@ -826,8 +824,8 @@ install(EXPORT torrent-rasterbarTargets
) )
install( install(
FILES FILES
"${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-config.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbarConfigVersion.cmake" "${CMAKE_CURRENT_BINARY_DIR}/libtorrent-rasterbar/libtorrent-rasterbar-config-version.cmake"
DESTINATION DESTINATION
${ConfigPackageLocation} ${ConfigPackageLocation}
) )

2
libtorrent-rasterbarConfig.cmake.in → libtorrent-rasterbar-config.cmake.in
View File

@ -8,7 +8,7 @@
include(CMakeFindDependencyMacro) include(CMakeFindDependencyMacro)
@_find_dependency_calls@ @_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(@PROJECT_NAME@_INCLUDE_DIRS Libtorrent::torrent-rasterbar INTERFACE_INCLUDE_DIRECTORIES)
get_target_property(_lt_iface_link_libraries Libtorrent::torrent-rasterbar INTERFACE_LINK_LIBRARIES) get_target_property(_lt_iface_link_libraries Libtorrent::torrent-rasterbar INTERFACE_LINK_LIBRARIES)