From: Yann Collet <Cyan4973@users.noreply.github.com>
Date: Fri, 19 Oct 2018 23:31:10 +0000 (-0700)
Subject: Merge pull request #1368 from rkjain89/test-branch
X-Git-Tag: v1.3.8~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f2cff22804e3d86327b06d51458003b40b455afc;p=thirdparty%2Fzstd.git

Merge pull request #1368 from rkjain89/test-branch

Moving Code To util.c
---

f2cff22804e3d86327b06d51458003b40b455afc
diff --cc build/cmake/programs/CMakeLists.txt
index 7c01b4c5b,708d2b27f..ef60a2dda
--- a/build/cmake/programs/CMakeLists.txt
+++ b/build/cmake/programs/CMakeLists.txt
@@@ -61,10 -55,8 +61,10 @@@ IF (UNIX
      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstd.1 DESTINATION "${MAN_INSTALL_DIR}")
      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstdcat.1 DESTINATION "${MAN_INSTALL_DIR}")
      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/unzstd.1 DESTINATION "${MAN_INSTALL_DIR}")
 +    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstdgrep.1 DESTINATION "${MAN_INSTALL_DIR}")
 +    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/zstdless.1 DESTINATION "${MAN_INSTALL_DIR}")
  
-     ADD_EXECUTABLE(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c)
+     ADD_EXECUTABLE(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/util.c ${PROGRAMS_DIR}/fileio.c)
      TARGET_LINK_LIBRARIES(zstd-frugal libzstd_static)
      SET_PROPERTY(TARGET zstd-frugal APPEND PROPERTY COMPILE_DEFINITIONS "ZSTD_NOBENCH;ZSTD_NODICT")
  ENDIF (UNIX)