[Cmake-commits] CMake branch, next, updated. v3.3.0-2168-g775b29b

[Brad King]

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  775b29b01099f7cd1477031d4b0e147a4f8f0df8 (commit)
       via  68d427ad7e670b381bac62e8255bff8c539c3aa0 (commit)
      from  9fc7e85fcb4522f1ad6e92fc9000fff59d417d27 (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=775b29b01099f7cd1477031d4b0e147a4f8f0df8
commit 775b29b01099f7cd1477031d4b0e147a4f8f0df8
Merge: 9fc7e85 68d427a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 09:37:49 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 12 09:37:49 2015 -0400

    Merge topic 'java-updates' into next
    
    68d427ad fixup! UseJava: Add support for javah tool


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68d427ad7e670b381bac62e8255bff8c539c3aa0
commit 68d427ad7e670b381bac62e8255bff8c539c3aa0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 09:32:01 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Aug 12 09:32:01 2015 -0400

    fixup! UseJava: Add support for javah tool

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 99bc6d0..f01a983 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3041,7 +3041,7 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
           )
         if(_result EQUAL 0)
           if(CMAKE_CONFIGURATION_TYPES)
-            set (JAVAH_LIBRARY_PATH ${CMake_BINARY_DIR}/Tests/JavaJavah/$<CONFIG>)
+            set (JAVAH_LIBRARY_PATH ${CMake_BINARY_DIR}/Tests/JavaJavah/$<CONFIGURATION>)
           else()
             set (JAVAH_LIBRARY_PATH ${CMake_BINARY_DIR}/Tests/JavaJavah)
           endif()

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

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


hooks/post-receive
-- 
CMake