Commit f8215f80 authored by Sergei Nikulov's avatar Sergei Nikulov
Browse files

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

parent 518ed51e

docs/cmdline-opts/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line 
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")

lib/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -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

tests/libtest/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -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