Change build variable name

Use ARROW_JNI_JAVA_<library>_[BIN|LIB]DIR instead of overriding CMAKE_INSTALL_[BIN|LIB]DIR
Bit-Quill · Jan 18, 2024 · cd6cbb3 · cd6cbb3
1 parent 70240fe
commit cd6cbb3
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/java/adapter/orc/CMakeLists.txt b/java/adapter/orc/CMakeLists.txt
@@ -37,11 +37,11 @@ set_property(TARGET arrow_java_jni_orc PROPERTY OUTPUT_NAME "arrow_orc_jni")
 target_link_libraries(arrow_java_jni_orc arrow_java_jni_orc_headers jni
                       Arrow::arrow_static)
 
-set(CMAKE_INSTALL_LIBDIR
+set(ARROW_JAVA_JNI_ORC_LIBDIR
     "${CMAKE_INSTALL_PREFIX}/lib/arrow_orc_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
-set(CMAKE_INSTALL_BINDIR
+set(ARROW_JAVA_JNI_ORC_BINDIR
     "${CMAKE_INSTALL_PREFIX}/bin/arrow_orc_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
 
 install(TARGETS arrow_java_jni_orc
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+        LIBRARY DESTINATION ${ARROW_JAVA_JNI_ORC_LIBDIR}
+        RUNTIME DESTINATION ${ARROW_JAVA_JNI_ORC_BINDIR})
diff --git a/java/c/CMakeLists.txt b/java/c/CMakeLists.txt
@@ -30,11 +30,11 @@ add_library(arrow_java_jni_cdata SHARED src/main/cpp/jni_wrapper.cc)
 set_property(TARGET arrow_java_jni_cdata PROPERTY OUTPUT_NAME "arrow_cdata_jni")
 target_link_libraries(arrow_java_jni_cdata arrow_java_jni_cdata_headers jni)
 
-set(CMAKE_INSTALL_LIBDIR
+set(ARROW_JAVA_JNI_CDATA_LIBDIR
     "${CMAKE_INSTALL_PREFIX}/lib/arrow_cdata_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
-set(CMAKE_INSTALL_BINDIR
+set(ARROW_JAVA_JNI_CDATA_BINDIR
     "${CMAKE_INSTALL_PREFIX}/bin/arrow_cdata_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
 
 install(TARGETS arrow_java_jni_cdata
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+        LIBRARY DESTINATION ${ARROW_JAVA_JNI_CDATA_LIBDIR}
+        RUNTIME DESTINATION ${ARROW_JAVA_JNI_CDATA_BINDIR})
diff --git a/java/dataset/CMakeLists.txt b/java/dataset/CMakeLists.txt
@@ -47,12 +47,12 @@ if(BUILD_TESTING)
   add_test(NAME arrow-java-jni-dataset-test COMMAND arrow-java-jni-dataset-test)
 endif()
 
-set(CMAKE_INSTALL_LIBDIR
+set(ARROW_JAVA_JNI_DATASET_LIBDIR
     "${CMAKE_INSTALL_PREFIX}/lib/arrow_dataset_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
 
-set(CMAKE_INSTALL_BINDIR
+set(ARROW_JAVA_JNI_DATASET_BINDIR
     "${CMAKE_INSTALL_PREFIX}/bin/arrow_dataset_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
 
 install(TARGETS arrow_java_jni_dataset
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+        LIBRARY DESTINATION ${ARROW_JAVA_JNI_DATASET_LIBDIR}
+        RUNTIME DESTINATION ${ARROW_JAVA_JNI_DATASET_BINDIR})
diff --git a/java/gandiva/CMakeLists.txt b/java/gandiva/CMakeLists.txt
@@ -84,11 +84,11 @@ if(CXX_LINKER_SUPPORTS_VERSION_SCRIPT)
   )
 endif()
 
-set(CMAKE_INSTALL_LIBDIR
+set(ARROW_JAVA_JNI_GANDIVA_LIBDIR
     "${CMAKE_INSTALL_PREFIX}/lib/gandiva_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
-set(CMAKE_INSTALL_BINDIR
+set(ARROW_JAVA_JNI_GANDIVA_BINDIR
     "${CMAKE_INSTALL_PREFIX}/bin/gandiva_jni/${ARROW_JAVA_JNI_ARCH_DIR}")
 
 install(TARGETS arrow_java_jni_gandiva
-        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-        RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+        LIBRARY DESTINATION ${ARROW_JAVA_JNI_GANDIVA_LIBDIR}
+        RUNTIME DESTINATION ${ARROW_JAVA_JNI_GANDIVA_BINDIR})