Skip to content

Commit 0d545aa

Browse files
author
Clement Champetier
committed
CMake: clean javac and jar command
* Get javac executable from Java_JAVAC_EXECUTABLE. * Get jar executable from Java_JAR_EXECUTABLE.
1 parent 94e1e69 commit 0d545aa

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/CMakeLists.txt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -88,16 +88,14 @@ if(SWIG_FOUND)
8888
swig_link_libraries(avtranscoder-java avtranscoder-shared)
8989

9090
# Post build of java binding : compile java files (generate class files) and create jar
91-
set(JAVAC "ENV{JAVA_HOME}/bin/javac")
92-
set(JAR "ENV{JAVA_HOME}/bin/jar")
9391
set(AVTRANSCODER_JAVA_OUTPUT_PATH "${PROJECT_BINARY_DIR}/src/AvTranscoder")
9492
set(AVTRANSCODER_JAR_PATH "${PROJECT_BINARY_DIR}/src")
9593
set(AVTRANSCODER_JAR_NAME "avtranscoder-jar.jar")
9694
ADD_CUSTOM_COMMAND(
9795
TARGET avtranscoder-java
9896
POST_BUILD
99-
COMMAND ${JAVAC} ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.java"
100-
COMMAND ${JAR} cvf ${AVTRANSCODER_JAR_NAME} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.class"
97+
COMMAND ${Java_JAVAC_EXECUTABLE} ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.java"
98+
COMMAND ${Java_JAR_EXECUTABLE} cvf ${AVTRANSCODER_JAR_NAME} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.class"
10199
)
102100

103101
# Install jar file

0 commit comments

Comments
 (0)