]> granicus.if.org Git - curl/commitdiff
cmake: fix build with cmake 2.8.12.2
authorPeter Wu <peter@lekensteyn.nl>
Thu, 30 Mar 2017 12:27:51 +0000 (14:27 +0200)
committerPeter Wu <peter@lekensteyn.nl>
Thu, 30 Mar 2017 21:43:35 +0000 (23:43 +0200)
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

docs/cmdline-opts/CMakeLists.txt
docs/libcurl/CMakeLists.txt
docs/libcurl/opts/CMakeLists.txt

index ccee4a142750e761e37e5bdf08529abc33435122..5aa20dfdb888d1cea8148642f3eb95ebdcefe65a 100644 (file)
@@ -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}")
index bdbcad45feaf9cf5202fd5e29c5074e5b28740fc..0b32c505479ebf6c750a1644bff0768c55880b0b 100644 (file)
@@ -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)
index 24c011180cfc6cedb9be7257be676c122e17bb11..709d3e4b8e24c4ae721614640976fbbffe944198 100644 (file)
@@ -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)