diff options
| author | Peter Wu <peter@lekensteyn.nl> | 2017-03-30 14:27:51 +0200 |
|---|---|---|
| committer | Peter Wu <peter@lekensteyn.nl> | 2017-03-30 23:43:35 +0200 |
| commit | ec493dbda2323e055c8861503d533870a697ce73 (patch) | |
| tree | 54444189a17bb8d07e4ae569140c19c95999b86c | |
| parent | e358a626f8e8f2f8e35f83d5021bed8fc6567149 (diff) | |
| download | curl-ec493dbda2323e055c8861503d533870a697ce73.tar.gz | |
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
| -rw-r--r-- | docs/cmdline-opts/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | docs/libcurl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | docs/libcurl/opts/CMakeLists.txt | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/docs/cmdline-opts/CMakeLists.txt b/docs/cmdline-opts/CMakeLists.txt index ccee4a142..5aa20dfdb 100644 --- a/docs/cmdline-opts/CMakeLists.txt +++ b/docs/cmdline-opts/CMakeLists.txt @@ -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}") diff --git a/docs/libcurl/CMakeLists.txt b/docs/libcurl/CMakeLists.txt index bdbcad45f..0b32c5054 100644 --- a/docs/libcurl/CMakeLists.txt +++ b/docs/libcurl/CMakeLists.txt @@ -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) diff --git a/docs/libcurl/opts/CMakeLists.txt b/docs/libcurl/opts/CMakeLists.txt index 24c011180..709d3e4b8 100644 --- a/docs/libcurl/opts/CMakeLists.txt +++ b/docs/libcurl/opts/CMakeLists.txt @@ -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) |