moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2025-01-10 21:48:10 -05:00
Code Issues Releases Wiki Activity

cmake: fixed path used in generation of docs/tests during curl build through add_subdicectory(...)

Browse Source
This commit is contained in:
Sergei Nikulov 2018-09-07 16:45:11 +03:00 committed by Sergei Nikulov
parent 518ed51ec7
commit f8215f80ab
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/cmdline-opts/CMakeLists.txt
View File

@ -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 # Load DPAGES and OTHERPAGES from shared file
transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") transform_makefile_inc("Makefile.inc" "${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake")

3
lib/CMakeLists.txt
View File

@ -105,7 +105,8 @@ if(WIN32)
endif() endif()
target_include_directories(${LIB_NAME} INTERFACE target_include_directories(${LIB_NAME} INTERFACE
$<INSTALL_INTERFACE:include>) $<INSTALL_INTERFACE:include>
$<BUILD_INTERFACE:${CURL_SOURCE_DIR}/include>)
install(TARGETS ${LIB_NAME} install(TARGETS ${LIB_NAME}
EXPORT libcurl-target EXPORT libcurl-target

4
tests/libtest/CMakeLists.txt
View File

@ -50,10 +50,10 @@ endif()
add_custom_command( add_custom_command(
OUTPUT lib1521.c 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 DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl" "${CMAKE_CURRENT_SOURCE_DIR}/mk-lib1521.pl"
"${CMAKE_SOURCE_DIR}/include/curl/curl.h" "${CURL_SOURCE_DIR}/include/curl/curl.h"
VERBATIM) VERBATIM)
set_property(TARGET chkdecimalpoint set_property(TARGET chkdecimalpoint