some more fix, add symlink to cadical cadiback

meelgroup · Jan 24, 2025 · 5035a1e · 5035a1e
1 parent 49bb835
commit 5035a1e
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 16 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -488,11 +488,13 @@ if (NOT NOCRYPTOMINISAT)
         REQUIRED)
     if (cadical)
         message(STATUS "Found CaDiCaL library at ${cadical}")
+        link_directories(${CMAKE_CURRENT_SOURCE_DIR}/deps/cadical/build/)
     else()
         message(FATAL_ERROR "CaDiCaL library not found")
     endif()
     if (cadiback)
         message(STATUS "Found CaDiBack library at ${cadiback}")
+        link_directories(${CMAKE_CURRENT_SOURCE_DIR}/deps/cadiback/)
     else()
         message(FATAL_ERROR "CaDiBack library not found")
     endif()

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
@@ -124,8 +124,8 @@ endif()
 # -----------------------------------------------------------------------------
 set(stp_link_libs
     ${MINISAT_LIBRARIES}
-    ${cadical}
-    ${cadiback})
+    ${cadiback}
+    ${cadical})
 
 if (USE_CRYPTOMINISAT)
     if (STATICCOMPILE)

diff --git a/scripts/deps/setup-cms.sh b/scripts/deps/setup-cms.sh
@@ -29,7 +29,8 @@ cd ..
 
 git clone https://github.com/msoos/cryptominisat "${dep}" || true
 cd "${dep}"
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake -DSTATS=OFF -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 cmake --build . --parallel "$(nproc)"
 cmake --install .

diff --git a/scripts/deps/setup-minisat.sh b/scripts/deps/setup-minisat.sh
@@ -12,7 +12,8 @@ dep="minisat"
 cd "${dep_dir}"
 git clone https://github.com/stp/minisat "${dep}" || true
 cd "${dep}"
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 cmake --build . --parallel "$(nproc)"
 cmake --install .

diff --git a/scripts/deps/setup-staticdeps.sh b/scripts/deps/setup-staticdeps.sh
@@ -17,11 +17,12 @@ dep="minisat"
 cd "${dep_dir}"
 git clone https://github.com/stp/minisat "${dep}" || true
 cd "${dep}"
-mkdir build && cd build
-cmake -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
+mkdir build || true
+cd build
+cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 cmake --build . --parallel "$(nproc)"
 cmake --install .
-cd ..
+cd ../..
 
 dep="cms"
 
@@ -31,20 +32,21 @@ cd cadical
 git checkout mate-only-libraries-1.8.0
 ./configure
 make -j "$(nproc)"
-cp build/libcadical.* ${install_dir}/lib/
+ln -s build/libcadical.* ${install_dir}/lib/
 cd ..
 
 git clone https://github.com/meelgroup/cadiback || true
 cd cadiback
 git checkout mate
 ./configure
 make -j "$(nproc)"
-cp libcadiback.* ${install_dir}/lib/
+ln -s libcadiback.* ${install_dir}/lib/
 cd ..
 
 git clone https://github.com/msoos/cryptominisat "${dep}" || true
 cd "${dep}"
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake -DSTATS=OFF -DSTATICCOMPILE=ON -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 cmake --build . --parallel "$(nproc)"
 cmake --install .
@@ -53,42 +55,48 @@ cd ..
 
 git clone https://github.com/meelgroup/louvain-community || true
 cd louvain-community
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" -DSTATICCOMPILE=ON ..
 make -j10
 cd ../..
 
 git clone https://github.com/meelgroup/sbva || true
 cd sbva
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}"  -DSTATICCOMPILE=ON ..
 make -j8
 cd ../..
 
 git clone https://github.com/meelgroup/arjun || true
 cd arjun
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}"  -DSTATICCOMPILE=ON ..
 make -j8
 cd ../..
 
 git clone https://github.com/meelgroup/approxmc || true
 cd approxmc
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake  -DSTATICCOMPILE=ON -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j8
 cd ../..
 
 git clone https://github.com/meelgroup/unigen/ || true
 cd unigen
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake  -DSTATICCOMPILE=ON -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j8
 cd ../..
 
 git clone https://github.com/arijitsh/cmsgen/ || true
 cd cmsgen
-mkdir build && cd build
+mkdir build || true
+cd build
 cmake  -DSTATICCOMPILE=ON -DCMAKE_INSTALL_PREFIX:PATH="${install_dir}" ..
 make -j8
 cd ../..