aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouglas Heriot <douglas@douglasheriot.com>2015-06-24 18:04:26 +0200
committerAndreas Schneider <asn@cryptomilk.org>2015-06-24 18:17:05 +0200
commita65af1b3b8a4ea50fd687b6583eac93e38cf4f3b (patch)
tree4c087cfc3c362e36e5b8011e7de003ba92804c8b
parent5478de1a64251c3f7e19260e599045061136f2e9 (diff)
downloadlibssh-a65af1b3b8a4ea50fd687b6583eac93e38cf4f3b.tar.gz
libssh-a65af1b3b8a4ea50fd687b6583eac93e38cf4f3b.tar.xz
libssh-a65af1b3b8a4ea50fd687b6583eac93e38cf4f3b.zip
cmake: Do not use CMAKE_(SOURCE|BINARY)_DIR
-rw-r--r--CMakeLists.txt2
-rw-r--r--CPackConfig.cmake4
-rw-r--r--include/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--tests/CMakeLists.txt2
5 files changed, 7 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index ebd6bd0b..69d01969 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,7 +24,7 @@ set(LIBRARY_SOVERSION "4")
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH
- ${CMAKE_SOURCE_DIR}/cmake/Modules
+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules
)
# add definitions
diff --git a/CPackConfig.cmake b/CPackConfig.cmake
index 347d20a5..ed09fd99 100644
--- a/CPackConfig.cmake
+++ b/CPackConfig.cmake
@@ -4,10 +4,10 @@
### general settings
set(CPACK_PACKAGE_NAME ${APPLICATION_NAME})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The SSH library")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
+set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
set(CPACK_PACKAGE_VENDOR "The SSH Library Development Team")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
+set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
### versions
diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt
index cb3bd962..a01b5298 100644
--- a/include/CMakeLists.txt
+++ b/include/CMakeLists.txt
@@ -1,3 +1,3 @@
-project(headers C)
+project(libssh-headers-x C)
add_subdirectory(libssh)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5fd042db..6263e3e3 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,12 +1,12 @@
project(libssh-library C)
set(LIBSSH_PUBLIC_INCLUDE_DIRS
- ${CMAKE_SOURCE_DIR}/include
+ ${libssh_SOURCE_DIR}/include
CACHE INTERNAL "libssh public include directories"
)
set(LIBSSH_PRIVATE_INCLUDE_DIRS
- ${CMAKE_BINARY_DIR}
+ ${libssh_BINARY_DIR}
)
set(LIBSSH_LINK_LIBRARIES
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index a775c3c2..fc15ef03 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,4 @@
-project(tests C)
+project(libssh-tests C)
if (BSD OR SOLARIS OR OSX)
find_package(Argp)