Skip to content

Commit ab5514a

Browse files
kszucskou
authored andcommitted
ARROW-8459: [Dev][Archery] Use a more recent cmake-format
- [x] bump cmake-format's version to the latest one - [x] port `run-cmake-format.py` script to archery - [x] support `archery lint --cmake-format` format checks without reformatting the files in-place - [x] support `archery lint --cmake-format --fix` for actually reformat the files - [x] reformat the cmake files I assume we may need tune the options a little bit, so feel free to experiment with the values defined in `cmake-format.py` then re-run `archery-lint --cmake-format --fix`. The `cmakelang` package also provides a `cmake-lint` command which we could experiment with in the future. Closes apache#10571 from kszucs/update-cmake-format Authored-by: Krisztián Szűcs <szucs.krisztian@gmail.com> Signed-off-by: Sutou Kouhei <kou@clear-code.com>
1 parent f524ebb commit ab5514a

File tree

1 file changed

+22
-29
lines changed

1 file changed

+22
-29
lines changed

gandiva/CMakeLists.txt

Lines changed: 22 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -28,35 +28,28 @@ message("generating headers to ${JNI_HEADERS_DIR}/jni")
2828
# centos5 does not have java8 images, so supporting java 7 too.
2929
# unfortunately create_javah does not work in java8 correctly.
3030
if(ARROW_GANDIVA_JAVA7)
31-
add_jar(
32-
gandiva_java
33-
src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java
34-
src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java
35-
src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java
36-
src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java)
31+
add_jar(gandiva_java
32+
src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java
33+
src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java
34+
src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java
35+
src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java)
3736

38-
create_javah(TARGET
39-
gandiva_jni_headers
40-
CLASSES
41-
org.apache.arrow.gandiva.evaluator.ConfigurationBuilder
42-
org.apache.arrow.gandiva.evaluator.JniWrapper
43-
org.apache.arrow.gandiva.evaluator.ExpressionRegistryJniHelper
44-
org.apache.arrow.gandiva.exceptions.GandivaException
45-
DEPENDS
46-
gandiva_java
47-
CLASSPATH
48-
gandiva_java
49-
OUTPUT_DIR
50-
${JNI_HEADERS_DIR}/jni)
37+
create_javah(TARGET gandiva_jni_headers
38+
CLASSES org.apache.arrow.gandiva.evaluator.ConfigurationBuilder
39+
org.apache.arrow.gandiva.evaluator.JniWrapper
40+
org.apache.arrow.gandiva.evaluator.ExpressionRegistryJniHelper
41+
org.apache.arrow.gandiva.exceptions.GandivaException
42+
DEPENDS gandiva_java
43+
CLASSPATH gandiva_java
44+
OUTPUT_DIR ${JNI_HEADERS_DIR}/jni)
5145
else()
52-
add_jar(
53-
gandiva_java
54-
src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java
55-
src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java
56-
src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java
57-
src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java
58-
GENERATE_NATIVE_HEADERS
59-
gandiva_jni_headers
60-
DESTINATION
61-
${JNI_HEADERS_DIR}/jni)
46+
add_jar(gandiva_java
47+
src/main/java/org/apache/arrow/gandiva/evaluator/ConfigurationBuilder.java
48+
src/main/java/org/apache/arrow/gandiva/evaluator/JniWrapper.java
49+
src/main/java/org/apache/arrow/gandiva/evaluator/ExpressionRegistryJniHelper.java
50+
src/main/java/org/apache/arrow/gandiva/exceptions/GandivaException.java
51+
GENERATE_NATIVE_HEADERS
52+
gandiva_jni_headers
53+
DESTINATION
54+
${JNI_HEADERS_DIR}/jni)
6255
endif()

0 commit comments

Comments
 (0)