From 046c9571da9a81910ff3a666070588e83f6708d5 Mon Sep 17 00:00:00 2001
From: Marcus Holland-Moritz <github@mhxnet.de>
Date: Wed, 9 Dec 2020 11:03:23 +0100
Subject: [PATCH] Linking cleanup

---
 CMakeLists.txt | 45 +++++++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 14 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eaa3905a..24f47d66 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,6 +70,10 @@ pkg_check_modules(LIBLZMA IMPORTED_TARGET liblzma>=5.2.4)
 find_path(SPARSEHASH_INCLUDE_DIR sparsehash/dense_hash_map REQUIRED)
 find_program(RONN_EXE ronn)
 
+set(ZSTD_INCLUDE_DIR
+    ""
+    CACHE PATH "don't build folly with zstd" FORCE)
+
 set(compiler_only
     ON
     CACHE BOOL "only build thrift compiler")
@@ -78,6 +82,13 @@ add_subdirectory(folly EXCLUDE_FROM_ALL)
 add_subdirectory(fbthrift EXCLUDE_FROM_ALL)
 add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)
 
+set(ZSTD_LIBRARY_RELEASE
+    "ZSTD_LIBRARY_RELEASE-NOTFOUND"
+    CACHE FILEPATH "don't build folly with zstd" FORCE)
+set(ZSTD_LIBRARY_DEBUG
+    "ZSTD_LIBRARY_DEBUG-NOTFOUND"
+    CACHE FILEPATH "don't build folly with zstd" FORCE)
+
 if(WITH_TESTS)
   # Download and unpack googletest at configure time
   configure_file(CMakeLists.txt.gtest googletest-download/CMakeLists.txt)
@@ -307,23 +318,29 @@ endforeach()
 target_compile_definitions(dwarfs-bin PRIVATE FUSE_USE_VERSION=35
                                               _FILE_OFFSET_BITS=64)
 
-foreach(tgt ${BINARY_TARGETS})
-  target_link_libraries(
-    ${tgt}
-    dwarfs
-    metadata_thrift
-    thrift_light
-    folly
-    ${Boost_LIBRARIES}
-    libzstd_static
-    PkgConfig::LIBLZ4
-    PkgConfig::LIBLZMA)
+target_link_libraries(
+  ${tgt}
+  dwarfs
+  metadata_thrift
+  thrift_light
+  folly
+  ${Boost_LIBRARIES}
+  libzstd_static
+  PkgConfig::LIBLZ4
+  PkgConfig::LIBLZMA)
 
-  if(WITH_PYTHON)
-    target_link_libraries(${tgt} ${BOOST_PYTHON_LIBS} ${Python3_LIBRARIES})
-  endif()
+target_link_libraries(dwarfs-bin dwarfs)
+
+foreach(tgt mkdwarfs dwarfsck dwarfsbench dwarfs_test dwarfs_compat_test)
+  target_link_libraries(${tgt} dwarfs)
 endforeach()
 
+if(WITH_PYTHON)
+  foreach(tgt mkdwarfs dwarfs_test dwarfs_compat_test)
+    target_link_libraries(${tgt} ${BOOST_PYTHON_LIBS} ${Python3_LIBRARIES})
+  endforeach()
+endif()
+
 target_link_libraries(dwarfs-bin PkgConfig::FUSE3)
 
 set_target_properties(dwarfs-bin PROPERTIES OUTPUT_NAME dwarfs)