Fix lib64

8 files changed, 22 insertions, 22 deletions

diff --git a/cmake/FindCLN.cmake b/cmake/FindCLN.cmake
index b5b37ec59..687116dd3 100644
--- a/cmake/FindCLN.cmake
+++ b/cmake/FindCLN.cmake
@@ -61,13 +61,13 @@ if(NOT CLN_FOUND_SYSTEM)
     CONFIGURE_COMMAND cd <SOURCE_DIR> && ./autogen.sh && autoreconf -iv
     COMMAND <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --disable-shared
             --enable-static --with-pic
-    BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcln.a
+    BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libcln.a
   )
 
   add_dependencies(CLN-EP GMP)
 
   set(CLN_INCLUDE_DIR "${DEPS_BASE}/include/")
-  set(CLN_LIBRARIES "${DEPS_BASE}/lib/libcln.a")
+  set(CLN_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libcln.a")
 endif()
 
 set(CLN_FOUND TRUE)
diff --git a/cmake/FindCaDiCaL.cmake b/cmake/FindCaDiCaL.cmake
index f0e0f5652..6dace28c8 100644
--- a/cmake/FindCaDiCaL.cmake
+++ b/cmake/FindCaDiCaL.cmake
@@ -89,14 +89,14 @@ if(NOT CaDiCaL_FOUND_SYSTEM)
       <SOURCE_DIR>/build/makefile
     BUILD_COMMAND ${make_cmd} -C <SOURCE_DIR>/build libcadical.a
     INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/build/libcadical.a
-                    <INSTALL_DIR>/lib/libcadical.a
+            <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libcadical.a
     COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/src/cadical.hpp
             <INSTALL_DIR>/include/cadical.hpp
-    BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libcadical.a
+    BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libcadical.a
   )
 
   set(CaDiCaL_INCLUDE_DIR "${DEPS_BASE}/include/")
-  set(CaDiCaL_LIBRARIES "${DEPS_BASE}/lib/libcadical.a")
+  set(CaDiCaL_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libcadical.a")
 endif()
 
 set(CaDiCaL_FOUND TRUE)
diff --git a/cmake/FindCoCoA.cmake b/cmake/FindCoCoA.cmake
index d84bf0f2c..4c0f05586 100644
--- a/cmake/FindCoCoA.cmake
+++ b/cmake/FindCoCoA.cmake
@@ -75,7 +75,7 @@ if(NOT CoCoA_FOUND_SYSTEM)
   add_dependencies(CoCoA-EP GMP)
 
   set(CoCoA_INCLUDE_DIR "${DEPS_BASE}/include/")
-  set(CoCoA_LIBRARIES "${DEPS_BASE}/lib/libcocoa.a")
+  set(CoCoA_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libcocoa.a")
 endif()
 
 set(CoCoA_FOUND TRUE)
diff --git a/cmake/FindDummy.cmake.template b/cmake/FindDummy.cmake.template
index a9d75bc9a..83a6c4c29 100644
--- a/cmake/FindDummy.cmake.template
+++ b/cmake/FindDummy.cmake.template
@@ -75,7 +75,7 @@ if(NOT Dummy_FOUND_SYSTEM)
 
     # set the variables like the find_* commands at the top
     set(Dummy_INCLUDE_DIR "${DEPS_BASE}/include/")
-    set(Dummy_LIBRARIES "${DEPS_BASE}/lib/libdummy.a")
+    set(Dummy_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libdummy.a")
 endif()
 
 # just set this to true
diff --git a/cmake/FindGMP.cmake b/cmake/FindGMP.cmake
index c554197b9..82672f2ba 100644
--- a/cmake/FindGMP.cmake
+++ b/cmake/FindGMP.cmake
@@ -60,11 +60,11 @@ if(NOT GMP_FOUND_SYSTEM)
     CONFIGURE_COMMAND
       <SOURCE_DIR>/configure --prefix=<INSTALL_DIR> --enable-cxx --with-pic
       --disable-shared --enable-static --host=${TOOLCHAIN_PREFIX}
-    BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libgmp.a
+    BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libgmp.a
   )
 
   set(GMP_INCLUDE_DIR "${DEPS_BASE}/include/")
-  set(GMP_LIBRARIES "${DEPS_BASE}/lib/libgmp.a")
+  set(GMP_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libgmp.a")
 endif()
 
 set(GMP_FOUND TRUE)
diff --git a/cmake/FindGTest.cmake b/cmake/FindGTest.cmake
index d36829784..a4911835b 100644
--- a/cmake/FindGTest.cmake
+++ b/cmake/FindGTest.cmake
@@ -48,13 +48,13 @@ if(NOT GTest_FOUND_SYSTEM)
         COMMAND ${CMAKE_COMMAND} --build .
             --config ${CMAKE_BUILD_TYPE} --target gtest_main
         BUILD_BYPRODUCTS
-            <INSTALL_DIR>/lib/libgtest.a
-            <INSTALL_DIR>/lib/libgtest_main.a
+            <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libgtest.a
+            <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libgtest_main.a
     )
 
     set(GTest_INCLUDE_DIR "${DEPS_BASE}/include/")
-    set(GTest_LIBRARIES "${DEPS_BASE}/lib/libgtest.a")
-    set(GTest_MAIN_LIBRARIES "${DEPS_BASE}/lib/libgtest_main.a")
+    set(GTest_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libgtest.a")
+    set(GTest_MAIN_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libgtest_main.a")
 endif()
 
 set(GTest_FOUND TRUE)
diff --git a/cmake/FindKissat.cmake b/cmake/FindKissat.cmake
index e257d2b3d..90bab3713 100644
--- a/cmake/FindKissat.cmake
+++ b/cmake/FindKissat.cmake
@@ -60,14 +60,14 @@ if(NOT Kissat_FOUND_SYSTEM)
     CONFIGURE_COMMAND <SOURCE_DIR>/configure -fPIC --quiet
                       CC=${CMAKE_C_COMPILER}
     INSTALL_COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/build/libkissat.a
-                    <INSTALL_DIR>/lib/libkissat.a
+                    <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libkissat.a
     COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR>/src/kissat.h
             <INSTALL_DIR>/include/kissat/kissat.h
-    BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libkissat.a
+    BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libkissat.a
   )
 
   set(Kissat_INCLUDE_DIR "${DEPS_BASE}/include/")
-  set(Kissat_LIBRARIES "${DEPS_BASE}/lib/libkissat.a")
+  set(Kissat_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libkissat.a")
 endif()
 
 set(Kissat_FOUND TRUE)
diff --git a/cmake/FindPoly.cmake b/cmake/FindPoly.cmake
index e11d85c3f..1e41e28e0 100644
--- a/cmake/FindPoly.cmake
+++ b/cmake/FindPoly.cmake
@@ -90,11 +90,11 @@ if(NOT Poly_FOUND_SYSTEM)
     BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} static_pic_poly static_pic_polyxx
     INSTALL_COMMAND ${CMAKE_MAKE_PROGRAM} install
     COMMAND ${CMAKE_COMMAND} -E copy src/libpicpoly.a
-            <INSTALL_DIR>/lib/libpicpoly.a
+            <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libpicpoly.a
     COMMAND ${CMAKE_COMMAND} -E copy src/libpicpolyxx.a
-            <INSTALL_DIR>/lib/libpicpolyxx.a
-    BUILD_BYPRODUCTS <INSTALL_DIR>/lib/libpicpoly.a
-                     <INSTALL_DIR>/lib/libpicpolyxx.a
+            <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libpicpolyxx.a
+    BUILD_BYPRODUCTS <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libpicpoly.a
+                     <INSTALL_DIR>/${CMAKE_INSTALL_LIBDIR}/libpicpolyxx.a
   )
   ExternalProject_Add_Step(
     Poly-EP cleanup
@@ -104,8 +104,8 @@ if(NOT Poly_FOUND_SYSTEM)
   add_dependencies(Poly-EP GMP)
 
   set(Poly_INCLUDE_DIR "${DEPS_BASE}/include/")
-  set(Poly_LIBRARIES "${DEPS_BASE}/lib/libpicpoly.a")
-  set(PolyXX_LIBRARIES "${DEPS_BASE}/lib/libpicpolyxx.a")
+  set(Poly_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libpicpoly.a")
+  set(PolyXX_LIBRARIES "${DEPS_BASE}/${CMAKE_INSTALL_LIBDIR}/libpicpolyxx.a")
 endif()
 
 set(Poly_FOUND TRUE)