[Cmake-commits] CMake branch, next, updated. v3.7.0-1218-g8bf7371

Brad King brad.king at kitware.com
Wed Nov 16 08:00:43 EST 2016


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  8bf737196b333e36b64246d1771a143d0d9ed4b8 (commit)
       via  da0e3f90967bccfa31be347f703d637c52621a64 (commit)
      from  0ee52e4e935b7d55446ead2242b8f0231e11dda6 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8bf737196b333e36b64246d1771a143d0d9ed4b8
commit 8bf737196b333e36b64246d1771a143d0d9ed4b8
Merge: 0ee52e4 da0e3f9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 16 08:00:42 2016 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 16 08:00:42 2016 -0500

    Merge topic 'cmake-m4-destination' into next
    
    da0e3f90 install: Configurable DESTINATION for the cmake.m4 file


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=da0e3f90967bccfa31be347f703d637c52621a64
commit da0e3f90967bccfa31be347f703d637c52621a64
Author:     Konstantin Podsvirov <konstantin at podsvirov.pro>
AuthorDate: Fri Nov 11 00:52:59 2016 +0300
Commit:     Konstantin Podsvirov <konstantin at podsvirov.pro>
CommitDate: Tue Nov 15 23:17:59 2016 +0300

    install: Configurable DESTINATION for the cmake.m4 file
    
    The DESTINATION changed from share/aclocal to ${CMAKE_XDGDATA_DIR}/aclocal.

diff --git a/Auxiliary/CMakeLists.txt b/Auxiliary/CMakeLists.txt
index 8eb74b7..53cf2c5 100644
--- a/Auxiliary/CMakeLists.txt
+++ b/Auxiliary/CMakeLists.txt
@@ -1,4 +1,4 @@
 install(DIRECTORY vim/indent vim/syntax DESTINATION ${CMAKE_DATA_DIR}/editors/vim)
 install(FILES cmake-mode.el DESTINATION ${CMAKE_DATA_DIR}/editors/emacs)
-install(FILES cmake.m4 DESTINATION share/aclocal)
+install(FILES cmake.m4 DESTINATION ${CMAKE_XDGDATA_DIR}/aclocal)
 add_subdirectory (bash-completion)

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

Summary of changes:
 Auxiliary/CMakeLists.txt |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list