From 0127fa053e4706eedaae308855c2c7677c9ffbee Mon Sep 17 00:00:00 2001
From: Cristian Ruiz <cristian.ruiz@unil.ch>
Date: Wed, 13 Jul 2022 15:38:23 +0200
Subject: [PATCH] Revert "Remove unnecessary dependencies"
This reverts commit fa122d7b39094be300fb5a44a05985a77b73665b.
---
CMakeLists.txt | 4 ++++
make_cholmod.sh | 13 ++++++++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 427ba92..4f83f9e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -102,6 +102,10 @@ endif()
target_link_libraries(SQUIC PRIVATE
${SS_DIR}/lib/libcholmod.a
${SS_DIR}/lib/libsuitesparseconfig.a
+ ${SS_DIR}/lib/libcolamd.a
+ ${SS_DIR}/lib/libamd.a
+ ${SS_DIR}/lib/libcamd.a
+ ${SS_DIR}/lib/libccolamd.a
${SS_DIR}/lib/libmetis.a
)
target_include_directories(SQUIC PRIVATE ${SS_DIR}/include)
diff --git a/make_cholmod.sh b/make_cholmod.sh
index 4671359..1b4df97 100644
--- a/make_cholmod.sh
+++ b/make_cholmod.sh
@@ -47,13 +47,24 @@ read -p "Press any key to resume ..."
make library AUTOCC="no" CC="$CC" CXX="$CXX" JOBS="1" INSTALL="$INSTDIR" MY_METIS_LIB="$LIBDIR/libmetis.a" MY_METIS_INC="$INCDIR" CUDA="no"
echo -e "${GREEN}>> Copy files .. ${NC}"
+cp AMD/Lib/*.a $LIBDIR
+cp AMD/Include/*.h $INCDIR
+
+cp CAMD/Lib/*.a $LIBDIR
+cp CAMD/Include/*.h $INCDIR
+
+cp CCOLAMD/Lib/*.a $LIBDIR
+cp CCOLAMD/Include/*.h $INCDIR
cp CHOLMOD/Lib/*.a $LIBDIR
cp CHOLMOD/Include/*.h $INCDIR
+cp COLAMD/Lib/*.a $LIBDIR
+cp COLAMD/Include/*.h $INCDIR
+
cp SuiteSparse_config/*.a $LIBDIR
cp SuiteSparse_config/*.h $INCDIR
echo -e "${GREEN}>> Cleaningup ${NC}"
cd ..
-rm -rf SuiteSparse-4.5.4
+rm -rf SuiteSparse-4.5.4
\ No newline at end of file
--
GitLab