shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 18:04:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

cmake: Do not use cached LIBSSH_PUBLIC_INCLUDE_DIRS

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
This commit is contained in:
Andreas Schneider
2019-11-06 09:43:49 +01:00
parent 8c36a865f2
commit 4ab0fb2b48
7 changed files with 24 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/CMakeLists.txt
View File

@@ -6,10 +6,7 @@ set(examples_SRCS
connect_ssh.c connect_ssh.c
) )
include_directories( include_directories(${libssh_BINARY_DIR})
${LIBSSH_PUBLIC_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
)
if (ARGP_INCLUDE_DIR) if (ARGP_INCLUDE_DIR)
include_directories(${ARGP_INCLUDE_DIR}) include_directories(${ARGP_INCLUDE_DIR})

10
src/CMakeLists.txt
View File

@@ -1,7 +1,4 @@
set(LIBSSH_PUBLIC_INCLUDE_DIRS set(LIBSSH_PUBLIC_INCLUDE_DIRS ${libssh_SOURCE_DIR}/include)
${libssh_SOURCE_DIR}/include
CACHE INTERNAL "libssh public include directories"
)
set(LIBSSH_PRIVATE_INCLUDE_DIRS set(LIBSSH_PRIVATE_INCLUDE_DIRS
${libssh_BINARY_DIR} ${libssh_BINARY_DIR}
@@ -317,7 +314,10 @@ target_compile_options(ssh
${DEFAULT_C_COMPILE_FLAGS} ${DEFAULT_C_COMPILE_FLAGS}
-D_GNU_SOURCE) -D_GNU_SOURCE)
target_include_directories(ssh target_include_directories(ssh
PRIVATE ${LIBSSH_PUBLIC_INCLUDE_DIRS} ${LIBSSH_PRIVATE_INCLUDE_DIRS}) PUBLIC
$<BUILD_INTERFACE:${libssh_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>
PRIVATE ${LIBSSH_PRIVATE_INCLUDE_DIRS})
target_link_libraries(ssh target_link_libraries(ssh
PRIVATE ${LIBSSH_LINK_LIBRARIES}) PRIVATE ${LIBSSH_LINK_LIBRARIES})

15
tests/CMakeLists.txt
View File

@@ -6,15 +6,12 @@ endif (BSD OR SOLARIS OR OSX)
set(TORTURE_LIBRARY torture) set(TORTURE_LIBRARY torture)
include_directories( include_directories(${OPENSSL_INCLUDE_DIR}
${LIBSSH_PUBLIC_INCLUDE_DIRS} ${CMOCKA_INCLUDE_DIR}
${OPENSSL_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${CMOCKA_INCLUDE_DIR} ${libssh_BINARY_DIR}
${ZLIB_INCLUDE_DIR} ${libssh_SOURCE_DIR}/src
${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_SOURCE_DIR}
)
set(TORTURE_LINK_LIBRARIES set(TORTURE_LINK_LIBRARIES
${CMOCKA_LIBRARY} ${CMOCKA_LIBRARY}

4
tests/benchmarks/CMakeLists.txt
View File

@@ -4,9 +4,7 @@ set(benchmarks_SRCS
bench_scp.c bench_sftp bench_raw.c benchmarks.c latency.c bench_scp.c bench_sftp bench_raw.c benchmarks.c latency.c
) )
include_directories( include_directories(${libssh_BINARY_DIR})
${LIBSSH_PUBLIC_INCLUDE_DIRS}
)
add_executable(benchmarks ${benchmarks_SRCS}) add_executable(benchmarks ${benchmarks_SRCS})

14
tests/pkd/CMakeLists.txt
View File

@@ -2,14 +2,12 @@ project(pkd C)
if (WITH_SERVER AND UNIX AND NOT WIN32) if (WITH_SERVER AND UNIX AND NOT WIN32)
include_directories( include_directories(${libssh_SOURCE_DIR}/include
${LIBSSH_PUBLIC_INCLUDE_DIRS} ${CMOCKA_INCLUDE_DIR}
${CMOCKA_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR}
${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR} ${libssh_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR})
${CMAKE_CURRENT_SOURCE_DIR}
)
set(pkd_hello_src set(pkd_hello_src
pkd_daemon.c pkd_daemon.c

8
tests/server/CMakeLists.txt
View File

@@ -12,11 +12,9 @@ set(LIBSSH_SERVER_TESTS
torture_server_config torture_server_config
) )
include_directories( include_directories(${libssh_SOURCE_DIR}/include
${LIBSSH_PUBLIC_INCLUDE_DIRS} ${libssh_BINARY_DIR}
${CMAKE_BINARY_DIR} test_server)
test_server
)
if (ARGP_INCLUDE_DIR) if (ARGP_INCLUDE_DIR)
include_directories(${ARGP_INCLUDE_DIR}) include_directories(${ARGP_INCLUDE_DIR})

6
tests/server/test_server/CMakeLists.txt
View File

@@ -16,10 +16,8 @@ set(LIBSSH_SERVER_TESTS
# torture_server_kbdint # torture_server_kbdint
) )
include_directories( include_directories(${libssh_SOURCE_DIR}/include
${LIBSSH_PUBLIC_INCLUDE_DIRS} ${libssh_BINARY_DIR})
${CMAKE_BINARY_DIR}
)
if (ARGP_INCLUDE_DIR) if (ARGP_INCLUDE_DIR)
include_directories(${ARGP_INCLUDE_DIR}) include_directories(${ARGP_INCLUDE_DIR})