1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
|
Index: hdf5/CMakeLists.txt
===================================================================
--- hdf5.orig/CMakeLists.txt
+++ hdf5/CMakeLists.txt
@@ -275,9 +275,9 @@ set (HDF5_JAVA_JNI_SRC_DIR ${HDF
set (HDF5_JAVA_HDF5_SRC_DIR ${HDF5_SOURCE_DIR}/java/src/hdf)
set (HDF5_JAVA_TEST_SRC_DIR ${HDF5_SOURCE_DIR}/java/test)
set (HDF5_JAVA_LIB_DIR ${HDF5_SOURCE_DIR}/java/lib)
-set (HDF5_JAVA_LOGGING_JAR ${HDF5_SOURCE_DIR}/java/lib/slf4j-api-2.0.6.jar)
-set (HDF5_JAVA_LOGGING_NOP_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-nop-2.0.6.jar)
-set (HDF5_JAVA_LOGGING_SIMPLE_JAR ${HDF5_SOURCE_DIR}/java/lib/ext/slf4j-simple-2.0.6.jar)
+set (HDF5_JAVA_LOGGING_JAR /usr/share/java/slf4j-api.jar)
+set (HDF5_JAVA_LOGGING_NOP_JAR /usr/share/java/slf4j-nop.jar)
+set (HDF5_JAVA_LOGGING_SIMPLE_JAR /usr/share/java/slf4j-simple.jar)
set (HDF5_DOXYGEN_DIR ${HDF5_SOURCE_DIR}/doxygen)
set (HDF5_SRC_INCLUDE_DIRS ${HDF5_SRC_DIR})
Index: hdf5/java/test/CMakeLists.txt
===================================================================
--- hdf5.orig/java/test/CMakeLists.txt
+++ hdf5/java/test/CMakeLists.txt
@@ -69,7 +69,7 @@ if (HDF5_ENABLE_HDFS)
)
endif ()
-set (CMAKE_JAVA_INCLUDE_PATH "${HDF5_JAVA_LIB_DIR}/junit.jar;${HDF5_JAVA_LIB_DIR}/hamcrest-core.jar;${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_SIMPLE_JAR}")
+set (CMAKE_JAVA_INCLUDE_PATH "/usr/share/java/junit4.jar;/usr/share/java/hamcrest-core.jar;${HDF5_JAVA_JARS};${HDF5_JAVA_LOGGING_JAR};${HDF5_JAVA_LOGGING_SIMPLE_JAR}")
foreach (test_file ${HDF5_JAVA_TEST_SOURCES})
|
