Fixup CMake builds to remove usages of java_bytecode

Author: chrisr-diffblue

regression/CMakeLists.txt

@@ -32,7 +32,6 @@ add_subdirectory(cbmc-cover)
 add_subdirectory(goto-instrument-typedef)
 add_subdirectory(strings)
 add_subdirectory(invariants)
-add_subdirectory(goto-diff)
 add_subdirectory(test-script)
 if(NOT WIN32)
   add_subdirectory(goto-gcc)

src/goto-analyzer/CMakeLists.txt

@@ -21,7 +21,6 @@ target_link_libraries(goto-analyzer-lib
     util
 )
 
-add_if_library(goto-analyzer-lib java_bytecode)
 add_if_library(goto-analyzer-lib jsil)
 add_if_library(goto-analyzer-lib specc)
 add_if_library(goto-analyzer-lib php)

src/goto-cc/CMakeLists.txt

@@ -17,6 +17,7 @@ target_link_libraries(goto-cc-lib
     xml
     assembler
     langapi
+    json
 )
 
 add_if_library(goto-cc-lib jsil)

src/goto-diff/CMakeLists.txt

@@ -23,7 +23,6 @@ target_link_libraries(goto-diff-lib
     solvers
 )
 
-add_if_library(goto-diff-lib java_bytecode)
 add_if_library(goto-diff-lib jsil)
 add_if_library(goto-diff-lib php)
 

src/goto-instrument/CMakeLists.txt

@@ -27,7 +27,6 @@ target_link_libraries(goto-instrument-lib
     solvers
 )
 
-add_if_library(goto-instrument-lib java_bytecode)
 add_if_library(goto-instrument-lib glpk)
 
 # Executable

src/goto-programs/CMakeLists.txt

@@ -4,4 +4,4 @@ add_library(goto-programs ${sources})
 generic_includes(goto-programs)
 
 target_link_libraries(
-        goto-programs util assembler langapi analyses ansi-c java_bytecode)
+        goto-programs util assembler langapi analyses ansi-c)

src/jbmc/CMakeLists.txt

@@ -17,7 +17,6 @@ target_link_libraries(jbmc-lib
     goto-instrument-lib
     goto-programs
     goto-symex
-    java_bytecode
     json
     langapi
     linking

unit/CMakeLists.txt

@@ -2,6 +2,12 @@ file(GLOB_RECURSE sources "*.cpp" "*.h")
 
 file(GLOB_RECURSE testing_utils "testing-utils/*.cpp" "testing-utils/*.h")
 
+file(GLOB_RECURSE java_bytecode "java_bytecode/*.cpp" "java_bytecode/*.h")
+file(GLOB_RECURSE goto_program_generics
+    "goto-programs/goto_program_generics/*.cpp"
+    "goto-programs/goto_program_generics/*.h"
+)
+
 list(REMOVE_ITEM sources
     # Used in executables
     ${CMAKE_CURRENT_SOURCE_DIR}/miniBDD.cpp
@@ -22,6 +28,22 @@ list(REMOVE_ITEM sources
     # Will be built into a separate library and linked
     ${testing_utils}
 
+    # java_bytecode usage is being remove
+    ${java_bytecode}
+    ${goto_program_generics}
+    ${CMAKE_CURRENT_SOURCE_DIR}/analyses/dependence_graph.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/goto-programs/class_hierarchy_output.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/goto-programs/class_hierarchy_graph.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/goto-programs/remove_virtual_functions_without_fallback.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/pointer-analysis/custom_value_set_analysis.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/solvers/refinement/string_constraint_instantiation/instantiate_not_contains.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/solvers/refinement/string_refinement/dependency_graph.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/solvers/refinement/string_refinement/string_symbol_resolution.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/util/has_subtype.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/util/parameter_indices.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/util/simplify_expr.cpp
+
+
     # Intended to fail to compile
     ${CMAKE_CURRENT_SOURCE_DIR}/util/expr_cast/expr_undefined_casts.cpp
 )

unit/testing-utils/CMakeLists.txt

@@ -1,8 +1,14 @@
 file(GLOB_RECURSE sources "*.cpp" "*.h")
+
+list(REMOVE_ITEM sources
+    # Remove usage of java_bytecode
+    ${CMAKE_CURRENT_SOURCE_DIR}/load_java_class.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/load_java_class.h
+)
+
 add_library(testing-utils ${sources})
 target_link_libraries(testing-utils
     util
-    java_bytecode
 )
 target_include_directories(testing-utils
     PUBLIC