|
@@ -74,8 +74,19 @@ add_executable(uri_test uri_test.cc)
|
|
target_link_libraries(uri_test common gmock_main ${CMAKE_THREAD_LIBS_INIT})
|
|
target_link_libraries(uri_test common gmock_main ${CMAKE_THREAD_LIBS_INIT})
|
|
add_memcheck_test(uri uri_test)
|
|
add_memcheck_test(uri uri_test)
|
|
|
|
|
|
|
|
+# We want to link to all the libraries of hdfs_static library,
|
|
|
|
+# except jvm.lib since we want to override some of the functions
|
|
|
|
+# provided by jvm.lib.
|
|
|
|
+get_target_property(HDFS_STATIC_LIBS_NO_JVM hdfs_static LINK_LIBRARIES)
|
|
|
|
+list(REMOVE_ITEM HDFS_STATIC_LIBS_NO_JVM ${JAVA_JVM_LIBRARY})
|
|
add_executable(get_jni_test libhdfs_getjni_test.cc)
|
|
add_executable(get_jni_test libhdfs_getjni_test.cc)
|
|
-target_link_libraries(get_jni_test gmock_main hdfs_static ${CMAKE_THREAD_LIBS_INIT})
|
|
|
|
|
|
+target_link_libraries(get_jni_test
|
|
|
|
+ gmock_main
|
|
|
|
+ $<TARGET_OBJECTS:hdfs_obj>
|
|
|
|
+ $<TARGET_OBJECTS:x_platform_obj>
|
|
|
|
+ $<TARGET_OBJECTS:x_platform_obj_c_api>
|
|
|
|
+ ${HDFS_STATIC_LIBS_NO_JVM}
|
|
|
|
+ ${CMAKE_THREAD_LIBS_INIT})
|
|
add_memcheck_test(get_jni get_jni_test)
|
|
add_memcheck_test(get_jni get_jni_test)
|
|
|
|
|
|
add_executable(remote_block_reader_test remote_block_reader_test.cc)
|
|
add_executable(remote_block_reader_test remote_block_reader_test.cc)
|