From ee15a7009883d8e23ea7fa120ed43a653c283f22 Mon Sep 17 00:00:00 2001
From: Sebastian Ullrich <sebasti@nullri.ch>
Date: Fri, 15 Mar 2019 10:33:08 +0100
Subject: [PATCH] fix(*/CMakeLists): build all binaries via (staged) leanstatic

---
 src/CMakeLists.txt               |  4 ++--
 src/tests/kernel/CMakeLists.txt  |  9 ++++-----
 src/tests/library/CMakeLists.txt | 25 ++++++++++++-------------
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1539017131..689796a537 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -486,8 +486,8 @@ ADD_CUSTOM_TARGET(bin_lib ALL
 # Remark: this problem does not happen when we generate the DLL using msys2 on Windows.
 if (NOT("${CROSS_COMPILE}" MATCHES "ON"))
   if ("${STATIC}" MATCHES "OFF")
-    add_library(leanshared SHARED shared/init.cpp ${LEAN_OBJS})
-    target_link_libraries(leanshared ${EXTRA_LIBS})
+    add_library(leanshared SHARED shared/init.cpp)
+    target_link_libraries(leanshared leanstatic)
     install(TARGETS leanshared DESTINATION lib)
   endif()
   install(FILES libleanstatic.a DESTINATION lib)
diff --git a/src/tests/kernel/CMakeLists.txt b/src/tests/kernel/CMakeLists.txt
index f86aec32c2..1e55298487 100644
--- a/src/tests/kernel/CMakeLists.txt
+++ b/src/tests/kernel/CMakeLists.txt
@@ -1,7 +1,6 @@
-set(kernel_tst_objs ${LEAN_OBJS})
-add_executable(level level.cpp ${kernel_tst_objs})
-target_link_libraries(level ${EXTRA_LIBS})
+add_executable(level level.cpp)
+target_link_libraries(level leanstatic)
 add_exec_test(level "level")
-add_executable(max_sharing max_sharing.cpp ${kernel_tst_objs})
-target_link_libraries(max_sharing ${EXTRA_LIBS})
+add_executable(max_sharing max_sharing.cpp)
+target_link_libraries(max_sharing leanstatic)
 add_exec_test(max_sharing "max_sharing")
diff --git a/src/tests/library/CMakeLists.txt b/src/tests/library/CMakeLists.txt
index 259c0b39fa..d3ff550309 100644
--- a/src/tests/library/CMakeLists.txt
+++ b/src/tests/library/CMakeLists.txt
@@ -1,19 +1,18 @@
-set(library_tst_objs ${LEAN_OBJS})
-add_executable(expr_lt expr_lt.cpp ${library_tst_objs})
-target_link_libraries(expr_lt ${EXTRA_LIBS})
+add_executable(expr_lt expr_lt.cpp)
+target_link_libraries(expr_lt leanstatic)
 add_exec_test(expr_lt "expr_lt")
-add_executable(deep_copy deep_copy.cpp ${library_tst_objs})
-target_link_libraries(deep_copy ${EXTRA_LIBS})
+add_executable(deep_copy deep_copy.cpp)
+target_link_libraries(deep_copy leanstatic)
 add_exec_test(deep_copy "deep_copy")
-add_executable(occurs occurs.cpp ${library_tst_objs})
-target_link_libraries(occurs ${EXTRA_LIBS})
+add_executable(occurs occurs.cpp)
+target_link_libraries(occurs leanstatic)
 add_exec_test(occurs "occurs")
-add_executable(head_map head_map.cpp ${library_tst_objs})
-target_link_libraries(head_map ${EXTRA_LIBS})
+add_executable(head_map head_map.cpp)
+target_link_libraries(head_map leanstatic)
 add_exec_test(head_map "head_map")
-add_executable(parray parray.cpp ${library_tst_objs})
-target_link_libraries(parray ${EXTRA_LIBS})
+add_executable(parray parray.cpp)
+target_link_libraries(parray leanstatic)
 add_exec_test(parray "parray")
-add_executable(phashtable phashtable.cpp ${library_tst_objs})
-target_link_libraries(phashtable ${EXTRA_LIBS})
+add_executable(phashtable phashtable.cpp)
+target_link_libraries(phashtable leanstatic)
 add_exec_test(phashtable "phashtable")