[Cmake-commits] CMake branch, next, updated. v3.5.1-835-g37b4d24

Brad King brad.king at kitware.com
Wed Apr 6 13:49:36 EDT 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  37b4d24572104b7159da87fbf3b6d4f6cd17c633 (commit)
       via  fa382ae85ed11cda00fa3163d5547a3ea434883e (commit)
      from  910b9d2fb7e6e073fcde335c6d90cf9226d4871c (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=37b4d24572104b7159da87fbf3b6d4f6cd17c633
commit 37b4d24572104b7159da87fbf3b6d4f6cd17c633
Merge: 910b9d2 fa382ae
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 6 13:49:35 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 6 13:49:35 2016 -0400

    Merge topic 'UseJava-cmake-command' into next
    
    fa382ae8 UseJava: use CMAKE_COMMAND instead of direct cmake call


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fa382ae85ed11cda00fa3163d5547a3ea434883e
commit fa382ae85ed11cda00fa3163d5547a3ea434883e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 6 12:14:09 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 6 13:46:51 2016 -0400

    UseJava: use CMAKE_COMMAND instead of direct cmake call
    
    Author: dancing-leaves <dancing-leaves at users.noreply.github.com>

diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 3850890..b59fe34 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -389,7 +389,7 @@ include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
 function (__java_copy_file src dest comment)
     add_custom_command(
         OUTPUT  ${dest}
-        COMMAND cmake -E copy_if_different
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different
         ARGS    ${src}
                 ${dest}
         DEPENDS ${src}

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

Summary of changes:
 Modules/UseJava.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list