CMake builds: build java-models-library only once

There is no need to run maven each and every time, instead make the
command depend on the *.java files having been updated. While at it,
also remove it from the top-level-dependencies and instead make jbmc
depend on it. Finally, also install core-models.jar.

Author: tautschnig

CMakeLists.txt

@@ -113,7 +113,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang" OR
             COMMAND ${CODE_COVERAGE_LCOV} ${LCOV_FLAGS} --remove ${CODE_COVERAGE_INFO_FILE} '/usr/*' --output-file ${CODE_COVERAGE_INFO_FILE}
             COMMAND ${CODE_COVERAGE_GENHTML} ${CODE_COVERAGE_INFO_FILE} --output-directory ${CODE_COVERAGE_OUTPUT_DIR}
             DEPENDS
-              java-models-library
               "$<TARGET_FILE:java-unit>"
               "$<TARGET_FILE:unit>"
               "$<TARGET_FILE:goto-harness>"
@@ -211,7 +210,6 @@ 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()
 

jbmc/CMakeLists.txt

@@ -2,15 +2,8 @@ add_subdirectory(regression)
 add_subdirectory(src)
 add_subdirectory(unit)
 
-add_custom_target(java-models-library ALL
-    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
-)
-
 cprover_default_properties(
     java_bytecode
-    java-models-library
     jbmc
     jbmc-lib
     janalyzer
@@ -21,3 +14,25 @@ cprover_default_properties(
     java-unit
     miniz
 )
+
+# java models library
+find_program(MAVEN_PROGRAM mvn REQUIRED)
+
+file(GLOB_RECURSE java_models_sources "lib/java-models-library/src/*.java")
+
+add_custom_command(OUTPUT "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/core-models.jar"
+    COMMAND ${MAVEN_PROGRAM} --quiet -Dmaven.test.skip=true package
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library
+    DEPENDS ${java_models_sources}
+)
+
+add_custom_target(java-models-library ALL
+    DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/core-models.jar"
+)
+
+install(
+  FILES
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/core-models.jar"
+    "${CMAKE_CURRENT_SOURCE_DIR}/lib/java-models-library/target/cprover-api.jar"
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)

jbmc/src/jbmc/CMakeLists.txt

@@ -31,3 +31,6 @@ target_link_libraries(jbmc-lib
 add_executable(jbmc jbmc_main.cpp)
 target_link_libraries(jbmc jbmc-lib)
 install(TARGETS jbmc DESTINATION ${CMAKE_INSTALL_BINDIR})
+
+# make sure java-models-library is built at least once
+add_dependencies(jbmc java-models-library)