CMake builds: ensure maven is available

tautschnig · tautschnig · commit 6666f1856ee1 · 2021-01-19T13:28:05.000Z
Use find_program rather than hard-coding mvn.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -218,6 +218,7 @@ cprover_default_properties(
 
 option(WITH_JBMC "Build the JBMC Java front-end" ON)
 if(WITH_JBMC)
+    find_program(MAVEN_PROGRAM mvn)
     add_subdirectory(jbmc)
 endif()
 
diff --git a/jbmc/CMakeLists.txt b/jbmc/CMakeLists.txt
@@ -3,7 +3,7 @@ add_subdirectory(src)
 add_subdirectory(unit)
 
 add_custom_target(java-models-library ALL
-    COMMAND mvn --quiet -Dmaven.test.skip=true package
+    COMMAND ${MAVEN_PROGRAM} --quiet -Dmaven.test.skip=true package
     COMMAND ${CMAKE_COMMAND} -E copy target/core-models.jar ${CMAKE_CURRENT_SOURCE_DIR}/src/java_bytecode/library/
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library
 )

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ add_subdirectory(src)`
`3`	`3`	`add_subdirectory(unit)`
`4`	`4`
`5`	`5`	`add_custom_target(java-models-library ALL`
`6`		`- COMMAND mvn --quiet -Dmaven.test.skip=true package`
	`6`	`+ COMMAND ${MAVEN_PROGRAM} --quiet -Dmaven.test.skip=true package`
`7`	`7`	`COMMAND ${CMAKE_COMMAND} -E copy target/core-models.jar ${CMAKE_CURRENT_SOURCE_DIR}/src/java_bytecode/library/`
`8`	`8`	`WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library`
`9`	`9`	`)`