Guix.scm and CMakeLists.txt: resolve includes for zlib and zstd

CMakeLists.txt

@@ -18,13 +18,9 @@ set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
 set(BUILD_SHARED_LIBS OFF)
 set(CMAKE_EXE_LINKER_FLAGS "-static")
 
-# find_package(ZLIB REQUIRED)
-# FindZLIB()
-
 find_package(PkgConfig REQUIRED)
 find_package(ZLIB REQUIRED)
-# set_package_properties(ZLIB PROPERTIES TYPE REQUIRED)
-
+find_package(ZSTD)
 
 # Preload the following libraries before running tests
 set(PRELOAD "libasan.so:libjemalloc.so.2")

guix.scm

@@ -2,7 +2,7 @@
 ;;
 ;;   guix build -f guix.scm
 ;;
-;; (make sure you are running a recent guix)
+;; (make sure you are running a recent guix and checked out all submodules)
 ;;
 ;; To do a cross compilation build for ARM64
 ;;
@@ -21,7 +21,7 @@
 ;;
 ;; Or for a release, something like
 ;;
-;;   cd build && rm -rf * ; cmake -DCMAKE_BUILD_TYPE=Release .. && make -j 16 VERBOSE=1 && ctest . --verbose
+;;   cd build && rm -rf ../build/* ; cmake -DCMAKE_BUILD_TYPE=Release .. && make -j 16 VERBOSE=1 && ctest . --verbose
 ;;
 ;; For the tests you may need /usr/bin/env. In a container create it with
 ;;
@@ -83,8 +83,9 @@
        ("sdsl-lite" ,sdsl-lite)
        ("libdivsufsort" ,libdivsufsort)
        ("zlib-static" ,zlib "static")
-       ("zlib" ,zlib)
+       ("zlib" ,zlib) ; also for the static build we need the includes
        ("zstd-lib" ,zstd "static")
+       ("zstd" ,zstd "lib") ; same
        ))
     (native-inputs
      `(("pkg-config" ,pkg-config)