put cadiback and cadical in correct places

meelgroup · Jan 23, 2025 · 01f3b67 · 01f3b67
1 parent 67cf723
commit 01f3b67
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -133,8 +133,6 @@ if (USE_CRYPTOMINISAT)
     else()
       set(stp_link_libs
         ${stp_link_libs}
-        ${cadiback}
-        ${cadical}
         ${CRYPTOMINISAT5_LIBRARIES})
     endif()
 endif()

diff --git a/scripts/deps/setup-cms.sh b/scripts/deps/setup-cms.sh
@@ -12,21 +12,27 @@ dep="cms"
 cd "${dep_dir}"
 
 
-git clone https://github.com/meelgroup/cadical
+# rm -rf "${dep}" || true
+# rm -rf cadical || true
+# rm -rf cadiback || true
+
+git clone https://github.com/meelgroup/cadical || true
 cd cadical
 git checkout mate-only-libraries-1.8.0
 ./configure
 make
+cp build/libcadical.* ${install_dir}/lib
 cd ..
 
-git clone https://github.com/meelgroup/cadiback
+git clone https://github.com/meelgroup/cadiback || true
 cd cadiback
 git checkout mate
 ./configure
 make
+cp build/libcadiback.* ${install_dir}/lib
 cd ..
 
-git clone https://github.com/msoos/cryptominisat "${dep}"
+git clone https://github.com/msoos/cryptominisat "${dep}" || true
 cd "${dep}"
 mkdir build && cd build
 cmake -DNOSQLITE=ON -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..

diff --git a/scripts/deps/setup-unisamp.sh b/scripts/deps/setup-unisamp.sh
@@ -11,42 +11,42 @@ echo "export LD_LIBRARY_PATH=$lib_dir:\$LD_LIBRARY_PATH" >> ~/.bashrc
 
 cd "${dep_dir}"
 
-git clone https://github.com/meelgroup/louvain-community
+git clone https://github.com/meelgroup/louvain-community || true
 cd louvain-community
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j10
 cd ../..
 
-git clone https://github.com/meelgroup/sbva
+git clone https://github.com/meelgroup/sbva || true
 cd sbva
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j8
 cd ../..
 
-git clone https://github.com/meelgroup/arjun
+git clone https://github.com/meelgroup/arjun || true
 cd arjun
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j8
 cd ../..
 
-git clone https://github.com/meelgroup/approxmc
+git clone https://github.com/meelgroup/approxmc || true
 cd approxmc
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j8
 cd ../..
 
-git clone https://github.com/meelgroup/unigen/
+git clone https://github.com/meelgroup/unigen/ || true
 cd unigen
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j8
 cd ../..
 
-git clone https://github.com/arijitsh/cmsgen/
+git clone https://github.com/arijitsh/cmsgen/ || true
 cd cmsgen
 mkdir build && cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..