about summary refs log tree commit diff homepage
diff options
context:
space:
mode:
-rw-r--r--lib/Basic/CMakeLists.txt10
-rw-r--r--lib/Solver/CMakeLists.txt1
-rw-r--r--lib/Solver/ConstructSolverChain.cpp (renamed from lib/Basic/ConstructSolverChain.cpp)0
-rw-r--r--unittests/TreeStream/CMakeLists.txt2
4 files changed, 2 insertions, 11 deletions
diff --git a/lib/Basic/CMakeLists.txt b/lib/Basic/CMakeLists.txt
index 78890ea6..d156116f 100644
--- a/lib/Basic/CMakeLists.txt
+++ b/lib/Basic/CMakeLists.txt
@@ -7,7 +7,6 @@
 #
 #===------------------------------------------------------------------------===#
 klee_add_component(kleeBasic
-  ConstructSolverChain.cpp
   KTest.cpp
   Statistics.cpp
 )
@@ -17,12 +16,3 @@ set(LLVM_COMPONENTS
 
 klee_get_llvm_libs(LLVM_LIBS ${LLVM_COMPONENTS})
 target_link_libraries(kleeBasic PUBLIC ${LLVM_LIBS})
-
-target_link_libraries(kleeBasic PRIVATE
-  # FIXME: THIS IS STUPID.
-  # `ConstructSolverChain.cpp` should be in
-  # `kleaverSolver` not in in `kleeBasic`.
-  # We are creating a circular dependency because
-  # of this because `kleaverSolver` depends on `kleeBasic`.
-  kleaverSolver
-)
diff --git a/lib/Solver/CMakeLists.txt b/lib/Solver/CMakeLists.txt
index f4cfa738..31c8302a 100644
--- a/lib/Solver/CMakeLists.txt
+++ b/lib/Solver/CMakeLists.txt
@@ -11,6 +11,7 @@ klee_add_component(kleaverSolver
   CachingSolver.cpp
   CexCachingSolver.cpp
   ConstantDivision.cpp
+  ConstructSolverChain.cpp
   CoreSolver.cpp
   DummySolver.cpp
   FastCexSolver.cpp
diff --git a/lib/Basic/ConstructSolverChain.cpp b/lib/Solver/ConstructSolverChain.cpp
index 39e0e824..39e0e824 100644
--- a/lib/Basic/ConstructSolverChain.cpp
+++ b/lib/Solver/ConstructSolverChain.cpp
diff --git a/unittests/TreeStream/CMakeLists.txt b/unittests/TreeStream/CMakeLists.txt
index 4b298724..ff9b4c3e 100644
--- a/unittests/TreeStream/CMakeLists.txt
+++ b/unittests/TreeStream/CMakeLists.txt
@@ -1,3 +1,3 @@
 add_klee_unit_test(TreeStreamTest
   TreeStreamTest.cpp)
-target_link_libraries(TreeStreamTest PRIVATE kleeBasic)
+target_link_libraries(TreeStreamTest PRIVATE kleeBasic kleeSupport)