From e1eb44e837f1001501b72503431212d233526911 Mon Sep 17 00:00:00 2001 From: Philip Schuchardt Date: Tue, 6 Jul 2021 19:37:22 -0400 Subject: [PATCH] Fix for issue #4 - using add_subdirectory --- CMakeLists.txt | 57 +++++++++++++++++++++++++------------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f29d8c8..323664b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -46,36 +46,37 @@ target_link_libraries(qlibssh2 target_compile_features(qlibssh2 PUBLIC cxx_std_17) -# --- Create installed package -include(CMakePackageConfigHelpers) -include(GNUInstallDirs) -set(PACKAGE_NAME ${CMAKE_PROJECT_NAME}) +if(NOT ${QLIBSSH2_SKIP_INSTALL_PACKAGE}) + # --- Create installed package + include(CMakePackageConfigHelpers) + include(GNUInstallDirs) + set(PACKAGE_NAME ${CMAKE_PROJECT_NAME}) -set(TARGETS_FILE ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/${PACKAGE_NAME}Targets.cmake) -configure_package_config_file( - cmake/${PACKAGE_NAME}Config.cmake.in - ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}Config.cmake - INSTALL_DESTINATION + set(TARGETS_FILE ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME}/${PACKAGE_NAME}Targets.cmake) + configure_package_config_file( + cmake/${PACKAGE_NAME}Config.cmake.in + ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}Config.cmake + INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME} - PATH_VARS + PATH_VARS TARGETS_FILE -) + ) -get_filename_component(TARGETS_FILE_WLE ${TARGETS_FILE} NAME_WLE) -install(TARGETS qlibssh2 - EXPORT ${TARGETS_FILE_WLE} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -) -install(EXPORT ${TARGETS_FILE_WLE} - NAMESPACE QLIBSSH2:: - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME} -) -install( - FILES + get_filename_component(TARGETS_FILE_WLE ${TARGETS_FILE} NAME_WLE) + install(TARGETS qlibssh2 + EXPORT ${TARGETS_FILE_WLE} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + ) + install(EXPORT ${TARGETS_FILE_WLE} + NAMESPACE QLIBSSH2:: + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME} + ) + install( + FILES ${CMAKE_BINARY_DIR}/${PACKAGE_NAME}Config.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME} -) -install(DIRECTORY src/include/ - DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} -) - + DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PACKAGE_NAME} + ) + install(DIRECTORY src/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PACKAGE_NAME} + ) +endif()