lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-08-10 06:23:02 +03:00
Code Activity

cmake: replace libssh2 literals with PROJECT_NAME variable

Browse Source 
Where applicable.

This also makes it more obvious which `libssh2` uses were referring
to the project itself.

Closes #1152
This commit is contained in:
Viktor Szakats
2023-08-09 11:23:37 +00:00
parent 42d3bf1348
commit 72fd25958a
2 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/libssh2-config.cmake.in
View File

@@ -4,7 +4,7 @@
include("${CMAKE_CURRENT_LIST_DIR}/libssh2-targets.cmake") include("${CMAKE_CURRENT_LIST_DIR}/libssh2-targets.cmake")
# Alias for either shared or static library # Alias for either shared or static library
add_library(libssh2::libssh2 ALIAS libssh2::@LIB_SELECTED@) add_library(@PROJECT_NAME@::libssh2 ALIAS @PROJECT_NAME@::@LIB_SELECTED@)
# Compatibility alias # Compatibility alias
add_library(Libssh2::libssh2 ALIAS libssh2::@LIB_SELECTED@) add_library(Libssh2::libssh2 ALIAS @PROJECT_NAME@::@LIB_SELECTED@)

26
src/CMakeLists.txt
View File

@@ -149,14 +149,14 @@ install(FILES
if(BUILD_STATIC_LIBS) if(BUILD_STATIC_LIBS)
install(TARGETS ${LIB_STATIC} install(TARGETS ${LIB_STATIC}
EXPORT libssh2-targets EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
endif() endif()
if(BUILD_SHARED_LIBS) if(BUILD_SHARED_LIBS)
install(TARGETS ${LIB_SHARED} install(TARGETS ${LIB_SHARED}
EXPORT libssh2-targets EXPORT ${PROJECT_NAME}-targets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
@@ -170,20 +170,20 @@ set(RUNTIME_DEPENDENCIES ${_RUNTIME_DEPENDENCIES} CACHE INTERNAL
# Package config # Package config
## During package installation, install libssh2-targets.cmake ## During package installation, install libssh2-targets.cmake
install(EXPORT libssh2-targets install(EXPORT ${PROJECT_NAME}-targets
NAMESPACE libssh2:: NAMESPACE ${PROJECT_NAME}::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2) DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
## During build, register directly from build tree ## During build, register directly from build tree
# create libssh2-targets.cmake # create libssh2-targets.cmake
export(TARGETS ${libssh2_export} NAMESPACE libssh2:: FILE libssh2-targets.cmake) export(TARGETS ${libssh2_export} NAMESPACE ${PROJECT_NAME}:: FILE ${PROJECT_NAME}-targets.cmake)
export(PACKAGE libssh2) # register it export(PACKAGE ${PROJECT_NAME}) # register it
# Generate libssh2-config.cmake into build tree and install it # Generate libssh2-config.cmake into build tree and install it
configure_file(${PROJECT_SOURCE_DIR}/cmake/libssh2-config.cmake.in libssh2-config.cmake @ONLY) configure_file(${PROJECT_SOURCE_DIR}/cmake/libssh2-config.cmake.in ${PROJECT_NAME}-config.cmake @ONLY)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/libssh2-config.cmake FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2) DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
## Export a .pc file for client projects not using CMaek ## Export a .pc file for client projects not using CMaek
if(LIBSSH2_PC_REQUIRES_PRIVATE) if(LIBSSH2_PC_REQUIRES_PRIVATE)
@@ -214,9 +214,9 @@ install(
include(CMakePackageConfigHelpers) include(CMakePackageConfigHelpers)
write_basic_package_version_file( write_basic_package_version_file(
${CMAKE_CURRENT_BINARY_DIR}/libssh2-config-version.cmake ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
VERSION "${LIBSSH2_VERSION_MAJOR}.${LIBSSH2_VERSION_MINOR}.${LIBSSH2_VERSION_PATCH}" VERSION "${LIBSSH2_VERSION_MAJOR}.${LIBSSH2_VERSION_MINOR}.${LIBSSH2_VERSION_PATCH}"
COMPATIBILITY SameMajorVersion) COMPATIBILITY SameMajorVersion)
install( install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/libssh2-config-version.cmake FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}-config-version.cmake
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/libssh2) DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})