From 883a67eee2051a3bb2386da54f23b6222f642f08 Mon Sep 17 00:00:00 2001 From: Yann Collet Date: Fri, 12 Feb 2016 03:50:05 +0100 Subject: [PATCH] fixed cmake --- contrib/cmake/CMakeLists.txt | 2 +- contrib/cmake/lib/CMakeLists.txt | 16 +++++++++------ contrib/cmake/programs/CMakeLists.txt | 13 ++++++------- programs/fileio.h | 28 ++++++++++++--------------- 4 files changed, 29 insertions(+), 30 deletions(-) diff --git a/contrib/cmake/CMakeLists.txt b/contrib/cmake/CMakeLists.txt index 3687c9ec..41883373 100644 --- a/contrib/cmake/CMakeLists.txt +++ b/contrib/cmake/CMakeLists.txt @@ -1,6 +1,6 @@ # ################################################################ # zstd - Makefile -# Copyright (C) Yann Collet 2014-2015 +# Copyright (C) Yann Collet 2014-2016 # All rights reserved. # # BSD license diff --git a/contrib/cmake/lib/CMakeLists.txt b/contrib/cmake/lib/CMakeLists.txt index a8247ddc..910e5060 100644 --- a/contrib/cmake/lib/CMakeLists.txt +++ b/contrib/cmake/lib/CMakeLists.txt @@ -1,6 +1,6 @@ # ################################################################ # zstd - Makefile -# Copyright (C) Yann Collet 2014-2015 +# Copyright (C) Yann Collet 2014-2016 # All rights reserved. # # BSD license @@ -27,8 +27,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # You can contact the author at : -# - zstd source repository : https://github.com/Cyan4973/zstd -# - Public forum : https://groups.google.com/forum/#!forum/lz4c +# - zstd homepage : http://www.zstd.net/ # ################################################################ # Get library version based on information from input content (use regular exp) @@ -58,6 +57,8 @@ GetLibraryVersion("${HEADER_CONTENT}" LIBVER_MAJOR LIBVER_MINOR LIBVER_RELEASE) MESSAGE("ZSTD VERSION ${LIBVER_MAJOR}.${LIBVER_MINOR}.${LIBVER_RELEASE}") SET(Sources + ${LIBRARY_DIR}/dictBuilder.c + ${LIBRARY_DIR}/divsufsort.c ${LIBRARY_DIR}/fse.c ${LIBRARY_DIR}/huff0.c ${LIBRARY_DIR}/zstd_buffered.c @@ -66,6 +67,7 @@ SET(Sources SET(Headers ${LIBRARY_DIR}/bitstream.h + ${LIBRARY_DIR}/dictBuilder.h ${LIBRARY_DIR}/error_private.h ${LIBRARY_DIR}/error_public.h ${LIBRARY_DIR}/fse.h @@ -86,13 +88,15 @@ IF (ZSTD_LEGACY_SUPPORT) SET(Sources ${Sources} ${LIBRARY_LEGACY_DIR}/zstd_v01.c ${LIBRARY_LEGACY_DIR}/zstd_v02.c - ${LIBRARY_LEGACY_DIR}/zstd_v03.c) + ${LIBRARY_LEGACY_DIR}/zstd_v03.c + ${LIBRARY_LEGACY_DIR}/zstd_v04.c) SET(Headers ${Headers} ${LIBRARY_LEGACY_DIR}/zstd_legacy.h ${LIBRARY_LEGACY_DIR}/zstd_v01.h ${LIBRARY_LEGACY_DIR}/zstd_v02.h - ${LIBRARY_LEGACY_DIR}/zstd_v03.h) + ${LIBRARY_LEGACY_DIR}/zstd_v03.h + ${LIBRARY_LEGACY_DIR}/zstd_v04.h) ENDIF (ZSTD_LEGACY_SUPPORT) IF (MSVC) @@ -161,7 +165,7 @@ IF (UNIX) SET(INSTALL_INCLUDE_DIR ${PREFIX}/include) # install target - INSTALL(FILES ${LIBRARY_DIR}/zstd.h DESTINATION ${INSTALL_INCLUDE_DIR}) + INSTALL(FILES ${LIBRARY_DIR}/zstd.h ${LIBRARY_DIR}/zstd_buffered.h ${LIBRARY_DIR}/dictBuilder.h DESTINATION ${INSTALL_INCLUDE_DIR}) INSTALL(TARGETS libzstd_static DESTINATION ${INSTALL_LIBRARY_DIR}) INSTALL(TARGETS libzstd_shared LIBRARY DESTINATION ${INSTALL_LIBRARY_DIR}) diff --git a/contrib/cmake/programs/CMakeLists.txt b/contrib/cmake/programs/CMakeLists.txt index af9a0572..ebee7c21 100644 --- a/contrib/cmake/programs/CMakeLists.txt +++ b/contrib/cmake/programs/CMakeLists.txt @@ -1,6 +1,6 @@ # ################################################################ # zstd - Makefile -# Copyright (C) Yann Collet 2014-2015 +# Copyright (C) Yann Collet 2014-2016 # All rights reserved. # # BSD license @@ -27,8 +27,7 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # # You can contact the author at : -# - zstd source repository : https://github.com/Cyan4973/zstd -# - Public forum : https://groups.google.com/forum/#!forum/lz4c +# - zstd homepage : http://www.zstd.net/ # ################################################################ PROJECT(programs) @@ -59,7 +58,7 @@ IF (ZSTD_LEGACY_SUPPORT) SET(ZSTD_FILEIO_LEGACY ${PROGRAMS_LEGACY_DIR}/fileio_legacy.c) ENDIF (ZSTD_LEGACY_SUPPORT) -ADD_EXECUTABLE(zstd ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/bench.c ${PROGRAMS_DIR}/xxhash.c ${PROGRAMS_DIR}/datagen.c ${ZSTD_FILEIO_LEGACY}) +ADD_EXECUTABLE(zstd ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c ${PROGRAMS_DIR}/bench.c ${PROGRAMS_DIR}/xxhash.c ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/dibio.c ${ZSTD_FILEIO_LEGACY}) TARGET_LINK_LIBRARIES(zstd libzstd_static) ADD_EXECUTABLE(fullbench ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/fullbench.c) @@ -69,9 +68,9 @@ ADD_EXECUTABLE(fuzzer ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/xxhash.c ${PROGR TARGET_LINK_LIBRARIES(fuzzer libzstd_static) IF (UNIX) - ADD_EXECUTABLE(zstd-noBench ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c ${ZSTD_FILEIO_LEGACY}) - TARGET_LINK_LIBRARIES(zstd-noBench libzstd_static) - SET_TARGET_PROPERTIES(zstd-noBench PROPERTIES COMPILE_DEFINITIONS "ZSTD_NOBENCH") + ADD_EXECUTABLE(zstd-frugal ${PROGRAMS_DIR}/zstdcli.c ${PROGRAMS_DIR}/fileio.c) + TARGET_LINK_LIBRARIES(zstd-frugal libzstd_static) + SET_TARGET_PROPERTIES(zstd-frugal PROPERTIES COMPILE_DEFINITIONS "ZSTD_NOBENCH;ZSTD_NODICT") ADD_EXECUTABLE(zbufftest ${PROGRAMS_DIR}/datagen.c ${PROGRAMS_DIR}/xxhash.c ${PROGRAMS_DIR}/zbufftest.c) TARGET_LINK_LIBRARIES(zbufftest libzstd_static) diff --git a/programs/fileio.h b/programs/fileio.h index 7e58817c..15a2c322 100644 --- a/programs/fileio.h +++ b/programs/fileio.h @@ -1,6 +1,6 @@ /* fileio.h - file i/o handler - Copyright (C) Yann Collet 2013-2015 + Copyright (C) Yann Collet 2013-2016 GPL v2 License @@ -19,8 +19,7 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. You can contact the author at : - - ZSTD source repository : https://github.com/Cyan4973/zstd - - Public forum : https://groups.google.com/forum/#!forum/lz4c + - ZSTD homepage : http://www.zstd.net/ */ #pragma once @@ -52,32 +51,29 @@ void FIO_setNotificationLevel(unsigned level); /* ************************************* * Single File functions ***************************************/ +/** FIO_compressFilename() : + @return : 0 == ok; 1 == pb with src file. */ int FIO_compressFilename (const char* outfilename, const char* infilename, const char* dictFileName, int compressionLevel); -int FIO_decompressFilename (const char* outfilename, const char* infilename, const char* dictFileName); -/** -FIO_compressFilename : - @result : 0 == ok; 1 == pb with src file. -FIO_decompressFilename : - @result : 0 == ok; 1 == pb with src file. -*/ +/** FIO_decompressFilename() : + @return : 0 == ok; 1 == pb with src file. */ +int FIO_decompressFilename (const char* outfilename, const char* infilename, const char* dictFileName); /* ************************************* * Multiple File functions ***************************************/ +/** FIO_compressMultipleFilenames() : + @return : nb of missing files */ int FIO_compressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles, const char* suffix, const char* dictFileName, int compressionLevel); + +/** FIO_decompressMultipleFilenames() : + @result : nb of missing or skipped files */ int FIO_decompressMultipleFilenames(const char** srcNamesTable, unsigned nbFiles, const char* suffix, const char* dictFileName); -/** -FIO_compressMultipleFilenames : - @result : nb of missing files -FIO_decompressMultipleFilenames : - @result : nb of missing or skipped files -*/ #if defined (__cplusplus)