[Cmake-commits] CMake branch, next, updated. v3.3.0-1851-g97b5cdd

[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  97b5cddf8e80efbca9ecfe324aed94e27225618c (commit)
       via  cfd751f140d546810fc2fa718f00a069e18ea1fd (commit)
      from  c783951c1fa1f6508145a845b0a00b2d1b17eeb0 (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=97b5cddf8e80efbca9ecfe324aed94e27225618c
commit 97b5cddf8e80efbca9ecfe324aed94e27225618c
Merge: c783951 cfd751f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 4 11:19:16 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 4 11:19:16 2015 -0400

    Merge topic 'java-updates' into next
    
    cfd751f1 Revise topic 'java-updates'


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cfd751f140d546810fc2fa718f00a069e18ea1fd
commit cfd751f140d546810fc2fa718f00a069e18ea1fd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 4 11:18:23 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 4 11:18:23 2015 -0400

    Revise topic 'java-updates'

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index bc8373b..5781a9e 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -3011,26 +3011,27 @@ ${CMake_BINARY_DIR}/bin/cmake -DDIR=dev -P ${CMake_SOURCE_DIR}/Utilities/Release
         add_test(Java.Jar ${CMAKE_CTEST_COMMAND}
           --build-and-test
           "${CMake_SOURCE_DIR}/Tests/Java"
-          "${CMake_BINARY_DIR}/Tests/Java"
+          "${CMake_BINARY_DIR}/Tests/JavaJar"
           ${build_generator_args}
           --build-project hello
           --build-target hello
           --build-two-config
-          --build-run-dir "${CMake_BINARY_DIR}/Tests/Java/"
+          --build-run-dir "${CMake_BINARY_DIR}/Tests/JavaJar/"
           --build-options ${build_options}
           --test-command ${JAVA_RUNTIME} -classpath hello.jar HelloWorld)
+        list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/JavaJar")
         add_test(Java.JarSourceList ${CMAKE_CTEST_COMMAND}
           --build-and-test
           "${CMake_SOURCE_DIR}/Tests/Java"
-          "${CMake_BINARY_DIR}/Tests/Java"
+          "${CMake_BINARY_DIR}/Tests/JavaJarSourceList"
           ${build_generator_args}
           --build-project hello
           --build-target hello2
           --build-two-config
-          --build-run-dir "${CMake_BINARY_DIR}/Tests/Java/"
+          --build-run-dir "${CMake_BINARY_DIR}/Tests/JavaJarSourceList/"
           --build-options ${build_options}
           --test-command ${JAVA_RUNTIME} -classpath hello2.jar HelloWorld)
-        list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/Java")
+        list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Tests/JavaJarSourceList")
       endif()
     endif()
   endif()

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

Summary of changes:
 Tests/CMakeLists.txt |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake