[Cmake-commits] CMake branch, next, updated. v3.3.0-2198-g2f3b67c

Brad King brad.king at kitware.com
Thu Aug 13 09:29:53 EDT 2015


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  2f3b67c8eaa170d65fb27a3a55e7b7cc4d944f18 (commit)
       via  0b1ee3f37d9e25a3408f8a25b655dc1e3a6e84ce (commit)
      from  1e6b6f4760f83ea4e62b44975bec2fed2940068b (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=2f3b67c8eaa170d65fb27a3a55e7b7cc4d944f18
commit 2f3b67c8eaa170d65fb27a3a55e7b7cc4d944f18
Merge: 1e6b6f4 0b1ee3f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 13 09:29:52 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Aug 13 09:29:52 2015 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=0b1ee3f37d9e25a3408f8a25b655dc1e3a6e84ce
commit 0b1ee3f37d9e25a3408f8a25b655dc1e3a6e84ce
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Aug 13 09:29:22 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Aug 13 09:29:22 2015 -0400

    fixup! UseJava: Add support for javah tool

diff --git a/Tests/JavaJavah/CMakeLists.txt b/Tests/JavaJavah/CMakeLists.txt
index bc803a1..83b0ad0 100644
--- a/Tests/JavaJavah/CMakeLists.txt
+++ b/Tests/JavaJavah/CMakeLists.txt
@@ -12,7 +12,7 @@ find_package(JNI)
 add_jar(hello3 B.java HelloWorld2.java)
 create_javah(TARGET B_javah CLASSES B CLASSPATH hello3)
 
-add_library(B MODULE B.cpp)
+add_library(B SHARED B.cpp)
 add_dependencies(B B_javah)
 
 target_include_directories(B PRIVATE ${CMAKE_CURRENT_BINARY_DIR}

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list