From: Matthew Sotoudeh <masotoudeh@ucdavis.edu>
Date: Tue, 18 Jan 2022 17:24:02 +0000 (-0800)
Subject: Fix CMake script for static, auto-download, cln configuration (#7957)
X-Git-Tag: cvc5-1.0.0~531
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=23a7caf3026b8b6063e120590d925a20aa6b57ac;p=cvc5.git

Fix CMake script for static, auto-download, cln configuration (#7957)

The script was previously creating a 'CLN_STATIC_LIBRARIES' variable that
wasn't known about elsewhere in the code and caused issues when the Makefiles
depended on a CLN_LIBRARIES variable. Instead, the static libraries should just
go into CLN_LIBRARIES as normal.

This only seems to have affected the case where cln is set to auto-download and
the build is static.

Signed-off-by: Matthew Sotoudeh sotoudeh@stanford.edu
---

diff --git a/cmake/FindCLN.cmake b/cmake/FindCLN.cmake
index 025514189..b12c81685 100644
--- a/cmake/FindCLN.cmake
+++ b/cmake/FindCLN.cmake
@@ -74,7 +74,7 @@ if(NOT CLN_FOUND_SYSTEM)
   if(BUILD_SHARED_LIBS)
     set(CLN_LIBRARIES "${DEPS_BASE}/lib/libcln${CMAKE_SHARED_LIBRARY_SUFFIX}")
   else()
-    set(CLN_STATIC_LIBRARIES "${DEPS_BASE}/lib/libcln.a")
+    set(CLN_LIBRARIES "${DEPS_BASE}/lib/libcln.a")
   endif()
 endif()