[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.21 1.21.2.1

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Utilities
In directory public:/mounts/ram/cvs-serv17340/Utilities

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Utilities/CMakeLists.txt,v
retrieving revision 1.21
retrieving revision 1.21.2.1
diff -C 2 -d -r1.21 -r1.21.2.1
*** CMakeLists.txt	24 Oct 2007 15:36:47 -0000	1.21
--- CMakeLists.txt	15 May 2008 19:40:01 -0000	1.21.2.1
***************
*** 17,20 ****
--- 17,21 ----
             --help-full ${CMake_BINARY_DIR}/Docs/${target}.html
             --help-full ${CMake_BINARY_DIR}/Docs/${target}.1
+            --help-full ${CMake_BINARY_DIR}/Docs/${target}.docbook
        DEPENDS ${target}
        MAIN_DEPENDENCY ${dependency}
***************
*** 24,27 ****
--- 25,29 ----
        ${CMake_BINARY_DIR}/Docs/${target}.txt
        ${CMake_BINARY_DIR}/Docs/${target}.html
+       ${CMake_BINARY_DIR}/Docs/${target}.docbook
        )
      SET(DOC_FILES ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/${target}.txt)
***************
*** 45,48 ****
--- 47,54 ----
         --help-full ${CMake_BINARY_DIR}/Docs/cmake.html
         --help-full ${CMake_BINARY_DIR}/Docs/cmake.1
+        --help-full ${CMake_BINARY_DIR}/Docs/cmake.docbook
+        --help-policies ${CMake_BINARY_DIR}/Docs/cmake-policies.txt
+        --help-policies ${CMake_BINARY_DIR}/Docs/cmake-policies.html
+        --help-policies ${CMake_BINARY_DIR}/Docs/cmakepolicies.1
         --help-properties ${CMake_BINARY_DIR}/Docs/cmake-properties.txt
         --help-properties ${CMake_BINARY_DIR}/Docs/cmake-properties.html
***************
*** 69,72 ****
--- 75,79 ----
                ${CMake_BINARY_DIR}/Docs/cmakecompat.1
                ${CMake_BINARY_DIR}/Docs/cmakeprops.1
+               ${CMake_BINARY_DIR}/Docs/cmakepolicies.1
                ${CMake_BINARY_DIR}/Docs/cmakevars.1
                ${CMake_BINARY_DIR}/Docs/cmakemodules.1)
***************
*** 75,83 ****
      ${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-variables.txt
      ${CMake_BINARY_DIR}/Docs/cmake-variables.html 
!    ${CMake_BINARY_DIR}/Docs/cmake-modules.txt
      ${CMake_BINARY_DIR}/Docs/cmake-modules.html
      ${CMake_BINARY_DIR}/Docs/cmake-commands.txt
--- 82,93 ----
      ${CMake_BINARY_DIR}/Docs/cmake.txt
      ${CMake_BINARY_DIR}/Docs/cmake.html
+     ${CMake_BINARY_DIR}/Docs/cmake.docbook
+     ${CMake_BINARY_DIR}/Docs/cmake-policies.txt
+     ${CMake_BINARY_DIR}/Docs/cmake-policies.html
      ${CMake_BINARY_DIR}/Docs/cmake-properties.txt
      ${CMake_BINARY_DIR}/Docs/cmake-properties.html
      ${CMake_BINARY_DIR}/Docs/cmake-variables.txt
      ${CMake_BINARY_DIR}/Docs/cmake-variables.html 
!     ${CMake_BINARY_DIR}/Docs/cmake-modules.txt
      ${CMake_BINARY_DIR}/Docs/cmake-modules.html
      ${CMake_BINARY_DIR}/Docs/cmake-commands.txt