From d3e63e0078320eb910943948e71a90a6ad390e0b Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Sat, 5 Sep 2015 20:35:09 -0700 Subject: [PATCH] Change cmake to output same jar name (ntcore) as gradle. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c70e03dec8..a4aa157b32 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,16 +47,16 @@ if (NOT WITHOUT_JAVA) file(GLOB_RECURSE JAVA_SOURCES java/src/*.java) set(CMAKE_JNI_TARGET true) - add_jar(networktables ${JAVA_SOURCES}) + add_jar(ntcore_jar ${JAVA_SOURCES} OUTPUT_NAME ntcore) # Generate JNI headers add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/edu_wpi_first_wpilibj_networktables_NetworkTablesJNI.h" - DEPENDS networktables java/src/edu/wpi/first/wpilibj/networktables/NetworkTablesJNI.java + DEPENDS ntcore_jar java/src/edu/wpi/first/wpilibj/networktables/NetworkTablesJNI.java COMMAND "${Java_JAVAH_EXECUTABLE}" -jni -o "${CMAKE_CURRENT_BINARY_DIR}/edu_wpi_first_wpilibj_networktables_NetworkTablesJNI.h" - -classpath "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/networktables.dir/" + -classpath "${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/ntcore_jar.dir/" edu.wpi.first.wpilibj.networktables.NetworkTablesJNI ) include_directories("${CMAKE_CURRENT_BINARY_DIR}")