[Cmake-commits] CMake branch, next, updated. v3.3.0-2172-gd50b6fb

[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  d50b6fb52f6b1d418da51113533a3c5aece5858b (commit)
       via  f6b552c0d50e274a1f6b77140586eb814b0724e3 (commit)
      from  1a6de5ad88bc7f92f9c573aba5fd64e7601dfa0d (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=d50b6fb52f6b1d418da51113533a3c5aece5858b
commit d50b6fb52f6b1d418da51113533a3c5aece5858b
Merge: 1a6de5a f6b552c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Aug 12 10:22:00 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 12 10:22:00 2015 -0400

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


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

    fixup! UseJava: Add support for javah tool

diff --git a/Tests/JavaJavah/B.cpp b/Tests/JavaJavah/B.cpp
index ef5e48c..2666757 100644
--- a/Tests/JavaJavah/B.cpp
+++ b/Tests/JavaJavah/B.cpp
@@ -1,11 +1,10 @@
 
 #include <jni.h>
-#include <iostream>
+#include <stdio.h>
 
 #include "B.h"
 
-JNIEXPORT void JNICALL Java_B_printName
-(JNIEnv *, jobject)
+JNIEXPORT void JNICALL Java_B_printName(JNIEnv *, jobject)
 {
-    std::cout << "B" << std::endl;
+  printf("B\n");
 }
diff --git a/Tests/JavaJavah/CMakeLists.txt b/Tests/JavaJavah/CMakeLists.txt
index 83b0ad0..bc803a1 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 SHARED B.cpp)
+add_library(B MODULE B.cpp)
 add_dependencies(B B_javah)
 
 target_include_directories(B PRIVATE ${CMAKE_CURRENT_BINARY_DIR}

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

Summary of changes:
 Tests/JavaJavah/B.cpp          |    7 +++----
 Tests/JavaJavah/CMakeLists.txt |    2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake