[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2658-g758e428
Brad King
brad.king at kitware.com
Tue Mar 26 13:43:11 EDT 2013
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 758e42854526b2d8ef4f1fafcc8617bae6ab59f2 (commit)
via 78b464038d3ce2b1e37f1c808b502392146533a0 (commit)
from 2d3926d42e795b91d6ecec445fccfb42aaa88e3a (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=758e42854526b2d8ef4f1fafcc8617bae6ab59f2
commit 758e42854526b2d8ef4f1fafcc8617bae6ab59f2
Merge: 2d3926d 78b4640
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 26 13:42:59 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 26 13:42:59 2013 -0400
Merge topic 'use-java-INCLUDE_JARS' into next
78b4640 UseJava.cmake: Include CMakeParseArguments by full path
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=78b464038d3ce2b1e37f1c808b502392146533a0
commit 78b464038d3ce2b1e37f1c808b502392146533a0
Author: Brad King <brad.king at kitware.com>
AuthorDate: Tue Mar 26 13:31:08 2013 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Tue Mar 26 13:31:10 2013 -0400
UseJava.cmake: Include CMakeParseArguments by full path
Ensure that we get the CMakeParseArguments module that comes next to
this file rather than one provided by a consuming project.
diff --git a/Modules/UseJava.cmake b/Modules/UseJava.cmake
index 2752cf3..0438695 100644
--- a/Modules/UseJava.cmake
+++ b/Modules/UseJava.cmake
@@ -198,7 +198,7 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
-include(CMakeParseArguments)
+include(${CMAKE_CURRENT_LIST_DIR}/CMakeParseArguments.cmake)
function (__java_copy_file src dest comment)
add_custom_command(
-----------------------------------------------------------------------
Summary of changes:
Modules/UseJava.cmake | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list