From c157ba7ba89e4f5d55f2f20dd70c449d76cdf244 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Wed, 1 Aug 2018 18:10:40 +0100 Subject: [PATCH 1/2] Revert "CMake version.cpp: switch back to add_custom_target" --- src/util/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt index 826f0644477..2100c47a543 100644 --- a/src/util/CMakeLists.txt +++ b/src/util/CMakeLists.txt @@ -30,20 +30,18 @@ endif() file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/version.cpp.in "const char *CBMC_VERSION=\"@CBMC_RELEASE@ (@GIT_INFO@)\";\n") -add_custom_target( - generate_version_cpp +add_custom_command( + OUTPUT version.cpp COMMAND ${CMAKE_COMMAND} -D CBMC_SOURCE_DIR=${CBMC_SOURCE_DIR} -D CUR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_BINARY_DIR}/version.cmake - ) +) add_library(util ${sources} version.cpp) -add_dependencies(util generate_version_cpp) - generic_includes(util) target_link_libraries(util big-int langapi) From 1847066e05b45b1bd4a0ea71e046f07620fc16b6 Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Wed, 1 Aug 2018 14:43:23 +0100 Subject: [PATCH 2/2] Update jbmc/lib/java-models-library to java-models-library#8 (remove sun.* imports) --- jbmc/lib/java-models-library | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jbmc/lib/java-models-library b/jbmc/lib/java-models-library index 6b422b12109..c86885cfd2e 160000 --- a/jbmc/lib/java-models-library +++ b/jbmc/lib/java-models-library @@ -1 +1 @@ -Subproject commit 6b422b12109701901913742063fce89f62e2ea96 +Subproject commit c86885cfd2e8cf98947132de15bcfa3835ae3ebc