Commit ec493dbd authored by Peter Wu's avatar Peter Wu
Browse files

cmake: fix build with cmake 2.8.12.2 

For some reason, CMake 2.8.12.2 did not expand the list argument in a
single DEPENDS argument. Remove the quotes, so it gets expanded into
multiple arguments for add_custom_command and add_custom_target.

Fixes https://github.com/curl/curl/issues/1370
Closes #1372
parent e358a626

docs/cmdline-opts/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ include("${CMAKE_CURRENT_BINARY_DIR}/Makefile.inc.cmake") 


add_custom_command(OUTPUT "${MANPAGE}"

  COMMAND "${PERL_EXECUTABLE}" "${CMAKE_CURRENT_SOURCE_DIR}/gen.pl" mainpage "${CMAKE_CURRENT_SOURCE_DIR}" > "${MANPAGE}"

  DEPENDS "${DPAGES}" "${OTHERPAGES}"

  DEPENDS ${DPAGES} ${OTHERPAGES}

  VERBATIM

)

add_custom_target(generate-curl.1 DEPENDS "${MANPAGE}")

docs/libcurl/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ add_manual_pages(man_MANS) 


string(REPLACE ".3" ".html" HTMLPAGES "${man_MANS}")

string(REPLACE ".3" ".pdf" PDFPAGES "${man_MANS}")

add_custom_target(html DEPENDS "${HTMLPAGES}")

add_custom_target(pdf DEPENDS "${PDFPAGES}")

add_custom_target(html DEPENDS ${HTMLPAGES})

add_custom_target(pdf DEPENDS ${PDFPAGES})



add_subdirectory(opts)

docs/libcurl/opts/CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ add_manual_pages(man_MANS) 


string(REPLACE ".3" ".html" HTMLPAGES "${man_MANS}")

string(REPLACE ".3" ".pdf" PDFPAGES "${man_MANS}")

add_custom_target(opts-html DEPENDS "${HTMLPAGES}")

add_custom_target(opts-pdf DEPENDS "${PDFPAGES}")

add_custom_target(opts-html DEPENDS ${HTMLPAGES})

add_custom_target(opts-pdf DEPENDS ${PDFPAGES})

add_dependencies(html opts-html)

add_dependencies(pdf opts-pdf)