diff options
-rw-r--r-- | examples/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/CMakeLists.txt | 5 | ||||
-rw-r--r-- | tests/CMakeLists.txt | 4 | ||||
-rw-r--r-- | tests/benchmarks/CMakeLists.txt | 13 | ||||
-rw-r--r-- | tests/pkd/CMakeLists.txt | 15 | ||||
-rw-r--r-- | tests/server/CMakeLists.txt | 8 | ||||
-rw-r--r-- | tests/server/test_server/CMakeLists.txt | 6 |
7 files changed, 39 insertions, 18 deletions
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 4341ac0e..82df58d0 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -6,8 +6,10 @@ set(examples_SRCS connect_ssh.c ) -include_directories(${libssh_SOURCE_DIR}/include - ${libssh_BINARY_DIR}) +include_directories( + ${LIBSSH_PUBLIC_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR} +) if (ARGP_INCLUDE_DIR) include_directories(${ARGP_INCLUDE_DIR}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b4ce17b9..300c28d7 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,4 +1,7 @@ -set(LIBSSH_PUBLIC_INCLUDE_DIRS ${libssh_SOURCE_DIR}/include) +set(LIBSSH_PUBLIC_INCLUDE_DIRS + ${libssh_SOURCE_DIR}/include + CACHE INTERNAL "libssh public include directories" +) set(LIBSSH_PRIVATE_INCLUDE_DIRS ${libssh_BINARY_DIR} diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index be1a3558..79d38536 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -7,12 +7,12 @@ endif (BSD OR SOLARIS OR OSX) set(TORTURE_LIBRARY torture) include_directories( - ${libssh_SOURCE_DIR}/include + ${LIBSSH_PUBLIC_INCLUDE_DIRS} ${OPENSSL_INCLUDE_DIR} ${CMOCKA_INCLUDE_DIR} ${ZLIB_INCLUDE_DIR} ${CMAKE_BINARY_DIR} - ${libssh_SOURCE_DIR}/src + ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR} ) diff --git a/tests/benchmarks/CMakeLists.txt b/tests/benchmarks/CMakeLists.txt index ddf3ff13..8dc8552f 100644 --- a/tests/benchmarks/CMakeLists.txt +++ b/tests/benchmarks/CMakeLists.txt @@ -4,9 +4,18 @@ set(benchmarks_SRCS bench_scp.c bench_sftp bench_raw.c benchmarks.c latency.c ) -include_directories(${libssh_SOURCE_DIR}/include - ${libssh_BINARY_DIR}) +include_directories( + ${LIBSSH_PUBLIC_INCLUDE_DIRS} +) add_executable(benchmarks ${benchmarks_SRCS}) target_link_libraries(benchmarks ${LIBSSH_SHARED_LIBRARY}) + +include_directories( + ${LIBSSH_PUBLIC_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR} +) + +if (WITH_SFTP) +endif (WITH_SFTP) diff --git a/tests/pkd/CMakeLists.txt b/tests/pkd/CMakeLists.txt index 1f85637a..3eefae87 100644 --- a/tests/pkd/CMakeLists.txt +++ b/tests/pkd/CMakeLists.txt @@ -1,12 +1,15 @@ project(pkd C) if (WITH_SERVER AND UNIX AND NOT WIN32) - include_directories(${libssh_SOURCE_DIR}/include - ${CMOCKA_INCLUDE_DIR} - ${ZLIB_INCLUDE_DIR} - ${CMAKE_BINARY_DIR} - ${libssh_SOURCE_DIR}/src - ${CMAKE_CURRENT_SOURCE_DIR}) + +include_directories( + ${LIBSSH_PUBLIC_INCLUDE_DIRS} + ${CMOCKA_INCLUDE_DIR} + ${ZLIB_INCLUDE_DIR} + ${CMAKE_BINARY_DIR} + ${CMAKE_SOURCE_DIR}/src + ${CMAKE_CURRENT_SOURCE_DIR} +) set(pkd_hello_src pkd_daemon.c diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 9476ea91..deba556b 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -12,9 +12,11 @@ set(LIBSSH_SERVER_TESTS torture_server_config ) -include_directories(${libssh_SOURCE_DIR}/include - ${libssh_BINARY_DIR} - test_server) +include_directories( + ${LIBSSH_PUBLIC_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR} + test_server +) if (ARGP_INCLUDE_DIR) include_directories(${ARGP_INCLUDE_DIR}) diff --git a/tests/server/test_server/CMakeLists.txt b/tests/server/test_server/CMakeLists.txt index da02a054..cc8ed6f0 100644 --- a/tests/server/test_server/CMakeLists.txt +++ b/tests/server/test_server/CMakeLists.txt @@ -16,8 +16,10 @@ set(LIBSSH_SERVER_TESTS # torture_server_kbdint ) -include_directories(${libssh_SOURCE_DIR}/include - ${libssh_BINARY_DIR}) +include_directories( + ${LIBSSH_PUBLIC_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR} +) if (ARGP_INCLUDE_DIR) include_directories(${ARGP_INCLUDE_DIR}) |