aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Nikulov <sergey.nikulov@gmail.com>2018-09-07 16:45:11 +0300
committerSergei Nikulov <snikulov@users.noreply.github.com>2018-09-28 16:54:20 +0300
commitf8215f80abe3b3b037d037f891f5f94aad68b440 (patch)
tree05679bcfa7de768a646d76b683018e79c19277c4
parent518ed51ec762c0512edb53437acb737a5a28942a (diff)
cmake: fixed path used in generation of docs/tests during curl build through add_subdicectory(...)
-rw-r--r--docs/cmdline-opts/CMakeLists.txt2
-rw-r--r--lib/CMakeLists.txt3
-rw-r--r--tests/libtest/CMakeLists.txt4
3 files changed, 5 insertions, 4 deletions
diff --git a/docs/cmdline-opts/CMakeLists.txt b/docs/cmdline-opts/CMakeLists.txt
index 5aa20dfdb..3c020d418 100644
--- a/docs/cmdline-opts/CMakeLists.txt
+++ b/docs/cmdline-opts/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(MANPAGE "${CMAKE_BINARY_DIR}/docs/curl.1")
+set(MANPAGE "${CURL_BINARY_DIR}/docs/curl.1")
# Load DPAGES and OTHERPAGES from shared file
transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index bd6d42707..be6f7a249 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -105,7 +105,8 @@ if(WIN32)
endif()
target_include_directories(${LIB_NAME} INTERFACE
- $<INSTALL_INTERFACE:include>)
+ $<INSTALL_INTERFACE:include>
+ $<BUILD_INTERFACE:${CURL_SOURCE_DIR}/include>)
install(TARGETS ${LIB_NAME}
EXPORT libcurl-target
diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index ac8d33328..6b14ad3e3 100644
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -50,10 +50,10 @@ endif()
add_custom_command(
OUTPUT lib1521.c
- COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CMAKE_SOURCE_DIR}/include/curl/curl.h > lib1521.c
+ COMMAND ${PERL_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl < ${CURL_SOURCE_DIR}/include/curl/curl.h > lib1521.c
DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl"
- "${CMAKE_SOURCE_DIR}/include/curl/curl.h"
+ "${CURL_SOURCE_DIR}/include/curl/curl.h"
VERBATIM)
set_property(TARGET chkdecimalpoint