[Cmake-commits] CMake branch, next, updated. v2.8.5-1736-g0a128f6

[David Cole]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  0a128f6bfa4b1d7db3cbfc3d091cc9a02e2a619f (commit)
       via  a2a0a8e0d5f8ad5e464363b952220f716c8fba14 (commit)
      from  0a867835376e67359e430f1e655510f255c48937 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0a128f6bfa4b1d7db3cbfc3d091cc9a02e2a619f
commit 0a128f6bfa4b1d7db3cbfc3d091cc9a02e2a619f
Merge: 0a86783 a2a0a8e
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 26 14:07:29 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Aug 26 14:07:29 2011 -0400

    Merge topic 'fix-install-rule-for-cmake-m4' into next
    
    a2a0a8e cmake.m4: Use modern signature of install(FILES ...)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a2a0a8e0d5f8ad5e464363b952220f716c8fba14
commit a2a0a8e0d5f8ad5e464363b952220f716c8fba14
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Fri Aug 26 13:51:32 2011 -0400
Commit:     David Cole <david.cole at kitware.com>
CommitDate: Fri Aug 26 13:51:32 2011 -0400

    cmake.m4: Use modern signature of install(FILES ...)
    
    The older install_files command uses a leading slash in front
    of the destination directory, whereas the modern signature does
    not. Use the modern signature since that's what the CMake devs
    are now used to.

diff --git a/Utilities/CMakeLists.txt b/Utilities/CMakeLists.txt
index 85db367..798c163 100644
--- a/Utilities/CMakeLists.txt
+++ b/Utilities/CMakeLists.txt
@@ -126,7 +126,7 @@ ADD_CUSTOM_COMMAND(
 
 INSTALL_FILES(${CMAKE_MAN_DIR}/man1 FILES ${MAN_FILES})
 INSTALL_FILES(${CMAKE_DOC_DIR} FILES ${HTML_FILES} ${TEXT_FILES})
-INSTALL_FILES(share/aclocal FILES cmake.m4)
+INSTALL(FILES cmake.m4 DESTINATION share/aclocal)
 
 # Drive documentation generation.
 ADD_CUSTOM_TARGET(documentation ALL DEPENDS ${DOC_FILES} ${CMake_BINARY_DIR}/Docs/cmake.txt )

-----------------------------------------------------------------------

Summary of changes:
 Utilities/CMakeLists.txt |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake