Merge pull request #113 from valnoel/fix_build_windows

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 21359af44808 · 2014-10-18T03:41:45.000-07:00
Windows: fix javac command for Jenkins system builds
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -121,7 +121,7 @@ if(SWIG_FOUND)
 		ADD_CUSTOM_COMMAND(
 			TARGET avtranscoder-java
 			POST_BUILD
-			COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.java"
+			COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "\"${AVTRANSCODER_JAVA_OUTPUT_PATH}\"/*.java"
 			COMMAND ${Java_JAR_EXECUTABLE} cf ${AVTRANSCODER_JAR_NAME} "-C" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "."
 		)
 

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ if(SWIG_FOUND)`
`121`	`121`	`ADD_CUSTOM_COMMAND(`
`122`	`122`	`TARGET avtranscoder-java`
`123`	`123`	`POST_BUILD`
`124`		`- COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.java"`
	`124`	`+ COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "\"${AVTRANSCODER_JAVA_OUTPUT_PATH}\"/*.java"`
`125`	`125`	`COMMAND ${Java_JAR_EXECUTABLE} cf ${AVTRANSCODER_JAR_NAME} "-C" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "."`
`126`	`126`	`)`
`127`	`127`