Fix cmake build for cadical

Author: zhassan-aws

scripts/cadical_CMakeLists.txt

@@ -1,8 +1,16 @@
 file(GLOB sources "src/*.cpp" "src/*.hpp" "src/*.h")
 # Remove "app" sources from list
-list(REMOVE_ITEM sources "src/cadical.cpp" "src/mobical.cpp")
+list(REMOVE_ITEM sources
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/cadical.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/mobical.cpp"
+)
+
 add_library(cadical ${sources})
 
+# Pass -DNBUILD to disable including the version information, which is not
+# needed since cbmc doesn't run the cadical binary
+target_compile_options(cadical PUBLIC -DNBUILD)
+
 set_target_properties(
     cadical
     PROPERTIES

src/solvers/CMakeLists.txt

@@ -117,17 +117,12 @@ foreach(SOLVER ${sat_impl})
             URL_MD5 b44874501a175106424f4bd5de29aa59
         )
 
+        add_subdirectory(${cadical_SOURCE_DIR} ${cadical_BINARY_DIR})
+
         target_compile_definitions(solvers PUBLIC
             SATCHECK_CADICAL HAVE_CADICAL
         )
 
-        add_library(cadical STATIC IMPORTED)
-
-        set_target_properties(
-            cadical
-            PROPERTIES IMPORTED_LOCATION ${cadical_SOURCE_DIR}/build/libcadical.a
-        )
-
         target_include_directories(solvers
             PUBLIC
             ${cadical_SOURCE_DIR}/src