From 55fa3825c0a22de9033d9a927953afb94fe57f3c Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Mon, 2 Jul 2007 11:05:43 -0400 Subject: [PATCH] BUG: fix build with cmake < 2.4 Alex --- Utilities/CMakeLists.txt | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt index d9d76bf20..af6e7beef 100644 --- a/Utilities/CMakeLists.txt +++ b/Utilities/CMakeLists.txt @@ -35,23 +35,12 @@ ADD_DOCS(ccmake ${CMake_SOURCE_DIR}/Utilities/Doxygen/authors.txt) ADD_DOCS(CMakeSetup ${CMake_SOURCE_DIR}/Utilities/Doxygen/doxyfile.in) # add the documentation for cmake itself -SET(CMAKE_DOC_FILES - ${CMake_BINARY_DIR}/Docs/cmake.txt - ${CMake_BINARY_DIR}/Docs/cmake.html - ${CMake_BINARY_DIR}/Docs/cmake-properties.txt - ${CMake_BINARY_DIR}/Docs/cmake-properties.html - ${CMake_BINARY_DIR}/Docs/cmake-modules.txt - ${CMake_BINARY_DIR}/Docs/cmake-modules.html - ${CMake_BINARY_DIR}/Docs/cmake-commands.txt - ${CMake_BINARY_DIR}/Docs/cmake-commands.html - ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt - ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html ) - GET_TARGET_PROPERTY(CMD cmake LOCATION) ADD_CUSTOM_COMMAND( - OUTPUT ${CMAKE_DOC_FILES} - COMMAND ${CMD} --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt + OUTPUT ${CMake_BINARY_DIR}/Docs/cmake.txt + COMMAND ${CMD} + ARGS --copyright ${CMake_BINARY_DIR}/Docs/Copyright.txt --help-full ${CMake_BINARY_DIR}/Docs/cmake.txt --help-full ${CMake_BINARY_DIR}/Docs/cmake.html --help-full ${CMake_BINARY_DIR}/Docs/cmake.1 @@ -78,7 +67,17 @@ INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES ${CMake_BINARY_DIR}/Docs/cmprops.1 ${CMake_BINARY_DIR}/Docs/cmmodules.1) -INSTALL_FILES(${CMAKE_DOC_DIR} FILES ${CMAKE_DOC_FILES} ) +INSTALL_FILES(${CMAKE_DOC_DIR} FILES + ${CMake_BINARY_DIR}/Docs/cmake.txt + ${CMake_BINARY_DIR}/Docs/cmake.html + ${CMake_BINARY_DIR}/Docs/cmake-properties.txt + ${CMake_BINARY_DIR}/Docs/cmake-properties.html + ${CMake_BINARY_DIR}/Docs/cmake-modules.txt + ${CMake_BINARY_DIR}/Docs/cmake-modules.html + ${CMake_BINARY_DIR}/Docs/cmake-commands.txt + ${CMake_BINARY_DIR}/Docs/cmake-commands.html + ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.txt + ${CMake_BINARY_DIR}/Docs/cmake-compatcommands.html ) # Drive documentation generation. -ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMAKE_DOC_FILES} ) +ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake.txt )