[cmake-commits] alex committed CMakeLists.txt 1.17 1.18
cmake-commits at cmake.org
cmake-commits at cmake.org
Mon Jul 2 11:05:45 EDT 2007
Update of /cvsroot/CMake/CMake/Utilities
In directory public:/mounts/ram/cvs-serv27587
Modified Files:
CMakeLists.txt
Log Message:
BUG: fix build with cmake < 2.4
Alex
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/CMakeLists.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- CMakeLists.txt 28 Jun 2007 19:04:28 -0000 1.17
+++ CMakeLists.txt 2 Jul 2007 15:05:43 -0000 1.18
@@ -35,23 +35,12 @@
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 @@
${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 )
More information about the Cmake-commits
mailing list