lib/libssh2
1
0
Fork 0
mirror of https://github.com/libssh2/libssh2.git synced 2025-11-18 15:20:56 +03:00
Code Activity

cmake: add quotes, delete ending dirseps

Browse Source 
Follow-up to 3fa5282d62 #1166
Closes #1437
This commit is contained in:
Viktor Szakats
2024-08-06 03:43:40 +02:00
parent bf3af90b3f
commit 2bb46d4481
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/CMakeLists.txt
View File

@@ -115,7 +115,7 @@ if(BUILD_STATIC_LIBS)
SUFFIX "${STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}") SUFFIX "${STATIC_LIB_SUFFIX}${CMAKE_STATIC_LIBRARY_SUFFIX}")
target_include_directories(${LIB_STATIC} target_include_directories(${LIB_STATIC}
PRIVATE "${PROJECT_SOURCE_DIR}/include/" ${libssh2_INCLUDE_DIRS} ${PRIVATE_INCLUDE_DIRECTORIES} PRIVATE "${PROJECT_SOURCE_DIR}/include" ${libssh2_INCLUDE_DIRS} ${PRIVATE_INCLUDE_DIRECTORIES}
PUBLIC PUBLIC
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>" "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")
@@ -136,7 +136,7 @@ if(BUILD_SHARED_LIBS)
POSITION_INDEPENDENT_CODE ON) POSITION_INDEPENDENT_CODE ON)
target_include_directories(${LIB_SHARED} target_include_directories(${LIB_SHARED}
PRIVATE "${PROJECT_SOURCE_DIR}/include/" ${libssh2_INCLUDE_DIRS} ${PRIVATE_INCLUDE_DIRECTORIES} PRIVATE "${PROJECT_SOURCE_DIR}/include" ${libssh2_INCLUDE_DIRS} ${PRIVATE_INCLUDE_DIRECTORIES}
PUBLIC PUBLIC
"$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>" "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>"
"$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>") "$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/${CMAKE_INSTALL_INCLUDEDIR}>")

10
tests/CMakeLists.txt
View File

@@ -48,7 +48,7 @@ list(APPEND DOCKER_TESTS ${DOCKER_TESTS_STATIC})
list(APPEND STANDALONE_TESTS ${STANDALONE_TESTS_STATIC}) list(APPEND STANDALONE_TESTS ${STANDALONE_TESTS_STATIC})
if(CMAKE_COMPILER_IS_GNUCC) if(CMAKE_COMPILER_IS_GNUCC)
find_program(GCOV_PATH gcov) find_program(GCOV_PATH "gcov")
if(GCOV_PATH) if(GCOV_PATH)
set(GCOV_CFLAGS "-g" "--coverage") set(GCOV_CFLAGS "-g" "--coverage")
if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0) if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 8.0)
@@ -59,11 +59,11 @@ endif()
option(RUN_SSHD_TESTS "Run tests requiring sshd" ON) option(RUN_SSHD_TESTS "Run tests requiring sshd" ON)
find_program(SH_EXECUTABLE sh) find_program(SH_EXECUTABLE "sh")
mark_as_advanced(SH_EXECUTABLE) mark_as_advanced(SH_EXECUTABLE)
if(SH_EXECUTABLE) if(SH_EXECUTABLE)
if(RUN_SSHD_TESTS) if(RUN_SSHD_TESTS)
find_program(SSHD_EXECUTABLE sshd) find_program(SSHD_EXECUTABLE "sshd")
mark_as_advanced(SSHD_EXECUTABLE) mark_as_advanced(SSHD_EXECUTABLE)
endif() endif()
@@ -158,11 +158,11 @@ endif()
add_custom_target(coverage add_custom_target(coverage
COMMAND gcovr --root "${PROJECT_SOURCE_DIR}" --exclude tests/* COMMAND gcovr --root "${PROJECT_SOURCE_DIR}" --exclude tests/*
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/coverage/" COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_CURRENT_BINARY_DIR}/coverage"
COMMAND gcovr --root "${PROJECT_SOURCE_DIR}" --exclude tests/* --html-details --output "${CMAKE_CURRENT_BINARY_DIR}/coverage/index.html") COMMAND gcovr --root "${PROJECT_SOURCE_DIR}" --exclude tests/* --html-details --output "${CMAKE_CURRENT_BINARY_DIR}/coverage/index.html")
add_custom_target(clean-coverage add_custom_target(clean-coverage
COMMAND rm -rf "${CMAKE_CURRENT_BINARY_DIR}/coverage/") COMMAND rm -rf "${CMAKE_CURRENT_BINARY_DIR}/coverage")
add_target_to_copy_dependencies( add_target_to_copy_dependencies(
TARGET copy_test_dependencies TARGET copy_test_dependencies