Correct java load library name access

5 files changed, 12 insertions, 10 deletions

diff --git a/java/examples/datasets/CMakeLists.txt b/java/examples/datasets/CMakeLists.txt
index 328c4b1..83343fc 100644
--- a/java/examples/datasets/CMakeLists.txt
+++ b/java/examples/datasets/CMakeLists.txt
@@ -72,8 +72,9 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
 endforeach ()
 
 macro (ADD_H5_TEST resultfile resultcode)
-  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY $<IF:$<CONFIG:Debug>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>)
-  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name};")
+  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
+  get_property (target_name_debug TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME_DEBUG)
+  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<IF:$<CONFIG:Debug>,${target_name_debug},${target_name}>;")
   add_test (
       NAME JAVA_datasets-${resultfile}
       COMMAND "${CMAKE_COMMAND}"
diff --git a/java/examples/datatypes/CMakeLists.txt b/java/examples/datatypes/CMakeLists.txt
index 18a99b8..701fe2a 100644
--- a/java/examples/datatypes/CMakeLists.txt
+++ b/java/examples/datatypes/CMakeLists.txt
@@ -57,8 +57,9 @@ foreach (HDFJAVA_JAR ${CMAKE_JAVA_INCLUDE_PATH})
 endforeach ()
 
 MACRO (ADD_H5_TEST resultfile resultcode)
-  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY $<IF:$<CONFIG:Debug>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>)
-  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name};")
+  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
+  get_property (target_name_debug TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME_DEBUG)
+  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<IF:$<CONFIG:Debug>,${target_name_debug},${target_name}>;")
   add_test (
       NAME JAVA_datatypes-${resultfile}
       COMMAND "${CMAKE_COMMAND}"
diff --git a/java/examples/groups/CMakeLists.txt b/java/examples/groups/CMakeLists.txt
index 8b16ffd..f0693ba 100644
--- a/java/examples/groups/CMakeLists.txt
+++ b/java/examples/groups/CMakeLists.txt
@@ -56,8 +56,9 @@ endforeach ()
 add_custom_target(H5Ex_G_Visit_files ALL COMMENT "Copying files needed by H5Ex_G_Visit tests" DEPENDS ${H5Ex_G_Visit_files_list})
 
 macro (ADD_H5_TEST resultfile resultcode)
-  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY $<IF:$<CONFIG:Debug>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>)
-  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name};")
+  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
+  get_property (target_name_debug TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME_DEBUG)
+  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<IF:$<CONFIG:Debug>,${target_name_debug},${target_name}>;")
   add_test (
       NAME JAVA_groups-${resultfile}
       COMMAND "${CMAKE_COMMAND}"
diff --git a/java/examples/intro/CMakeLists.txt b/java/examples/intro/CMakeLists.txt
index 86b6296..a4f0cdd 100644
--- a/java/examples/intro/CMakeLists.txt
+++ b/java/examples/intro/CMakeLists.txt
@@ -58,8 +58,9 @@ foreach (example ${HDF_JAVA_OBJECT_EXAMPLES})
 endforeach ()
 
 MACRO (ADD_H5_TEST resultfile resultcode)
-  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY $<IF:$<CONFIG:Debug>,OUTPUT_NAME_DEBUG,OUTPUT_NAME_RELWITHDEBINFO>)
-  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=${target_name};")
+  get_property (target_name TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME)
+  get_property (target_name_debug TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTPUT_NAME_DEBUG)
+  set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<IF:$<CONFIG:Debug>,${target_name_debug},${target_name}>;")
   add_test (
       NAME JAVA_intro-${resultfile}
       COMMAND "${CMAKE_COMMAND}"
diff --git a/java/test/CMakeLists.txt b/java/test/CMakeLists.txt
index 7910ea2..d677b5f 100644
--- a/java/test/CMakeLists.txt
+++ b/java/test/CMakeLists.txt
@@ -93,7 +93,6 @@ get_property (target_name_debug TARGET ${HDF5_JAVA_JNI_LIB_TARGET} PROPERTY OUTP
 set (CMD_ARGS "-Dhdf.hdf5lib.H5.loadLibraryName=$<IF:$<CONFIG:Debug>,${target_name_debug},${target_name}>;")
 
 foreach (test_file ${HDF5_JAVA_TEST_SOURCES})
-
   set (CMAKE_JAVA_CLASSPATH ".")
   foreach (CMAKE_INCLUDE_PATH ${CMAKE_JAVA_INCLUDE_PATH})
     set (CMAKE_JAVA_CLASSPATH "${CMAKE_JAVA_CLASSPATH}${CMAKE_JAVA_INCLUDE_FLAG_SEP}${CMAKE_INCLUDE_PATH}")
@@ -125,7 +124,6 @@ foreach (test_file ${HDF5_JAVA_TEST_SOURCES})
           -D "TEST_REFERENCE=JUnit-${test_file}.txt"
           -P "${HDF_RESOURCES_DIR}/jrunTest.cmake"
   )
-
   set_tests_properties (JUnit-${test_file} PROPERTIES
       ENVIRONMENT "HDF5_PLUGIN_PATH=${CMAKE_BINARY_DIR}/testdir2"
       DEPENDS "JUnit-${test_file}-clearall-objects"