Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-03 03:01:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change cmake to output same jar name (ntcore) as gradle.

Browse Source
This commit is contained in:
Peter Johnson
2015-09-05 20:35:09 -07:00
parent 21e21d3b8b
commit d3e63e0078
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@@ -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}")