diff options
| author | yann.collet.73@gmail.com <yann.collet.73@gmail.com@650e7d94-2a16-8b24-b05c-7c0b3f6821cd> | 2013-04-13 09:31:22 (GMT) |
|---|---|---|
| committer | yann.collet.73@gmail.com <yann.collet.73@gmail.com@650e7d94-2a16-8b24-b05c-7c0b3f6821cd> | 2013-04-13 09:31:22 (GMT) |
| commit | cbfd031d301222123d185320a55a923f9363f781 (patch) | |
| tree | 4d1b6bee26974c0bb98ec3c2989e8e1d81da3046 /cmake | |
| parent | 647baabcef0effcfcb3cc0dadb2970db681c9d52 (diff) | |
| download | lz4-cbfd031d301222123d185320a55a923f9363f781.zip lz4-cbfd031d301222123d185320a55a923f9363f781.tar.gz lz4-cbfd031d301222123d185320a55a923f9363f781.tar.bz2 | |
Added : LZ4 Streaming Format specification (v1.3)
Added : LZ4c command-line utility, supporting the new streaming format
Added : xxhash library
Removed : lz4demo is now replaced by lz4.c
Removed : a few level 4 warnings (issue 64)
Updated : makefiles
git-svn-id: https://lz4.googlecode.com/svn/trunk@92 650e7d94-2a16-8b24-b05c-7c0b3f6821cd
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | cmake/pack/CMakeLists.txt | 16 |
2 files changed, 19 insertions, 19 deletions
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt index 3d3e558..1afe650 100644 --- a/cmake/CMakeLists.txt +++ b/cmake/CMakeLists.txt @@ -2,7 +2,7 @@ PROJECT(LZ4) set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ASN.1 Compiler")
set(CPACK_PACKAGE_VERSION_MAJOR 0)
set(CPACK_PACKAGE_VERSION_MINOR 0)
-set(CPACK_PACKAGE_VERSION_PATCH r51)
+set(CPACK_PACKAGE_VERSION_PATCH r52)
#set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/COPYING_LGPL)
set(VERSION_STRING " \"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\" ")
include(CPack)
@@ -32,7 +32,7 @@ endif() set(SRC_DIR ../)
set(LZ4_SRCS_LIB ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h )
-set(LZ4_SRCS ${SRC_DIR}bench.c ${SRC_DIR}lz4demo.c)
+set(LZ4_SRCS ${SRC_DIR}xxhash.c ${SRC_DIR}bench.c ${SRC_DIR}lz4c.c)
if(NOT BUILD_SHARED_LIBS)
set(LZ4_SRCS ${LZ4_SRCS} ${LZ4_SRCS_LIB})
@@ -40,28 +40,28 @@ endif() if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
message(STATUS "Build 64bit executable binary")
- add_executable(lz4demo64 ${LZ4_SRCS})
- install(TARGETS lz4demo64 RUNTIME DESTINATION "./")
+ add_executable(lz4c64 ${LZ4_SRCS})
+ install(TARGETS lz4c64 RUNTIME DESTINATION "./")
if(NOT BUILD_SHARED_LIBS)
message(STATUS "Build 32bit executable binary")
- add_executable(lz4demo32 ${LZ4_SRCS})
- install(TARGETS lz4demo32 RUNTIME DESTINATION "./")
+ add_executable(lz4c32 ${LZ4_SRCS})
+ install(TARGETS lz4c32 RUNTIME DESTINATION "./")
- SET_TARGET_PROPERTIES(lz4demo32 PROPERTIES
+ SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
endif()
else()
message(STATUS "Build 32bit executable binary")
- add_executable(lz4demo32 ${LZ4_SRCS})
- install(TARGETS lz4demo32 RUNTIME DESTINATION "./")
+ add_executable(lz4c32 ${LZ4_SRCS})
+ install(TARGETS lz4c32 RUNTIME DESTINATION "./")
endif()
if(BUILD_SHARED_LIBS)
set(LZ4_SOVERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
if (CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- target_link_libraries(lz4demo64 liblz4)
+ target_link_libraries(lz4c64 liblz4)
else()
- target_link_libraries(lz4demo32 liblz4)
+ target_link_libraries(lz4c32 liblz4)
endif()
# for static library
diff --git a/cmake/pack/CMakeLists.txt b/cmake/pack/CMakeLists.txt index 6d23235..8e59824 100644 --- a/cmake/pack/CMakeLists.txt +++ b/cmake/pack/CMakeLists.txt @@ -42,21 +42,21 @@ INCLUDE_DIRECTORIES (${SRC_DIR}) set(LZ4_SRCS_LIB ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}lz4_format_description.txt)
-set(LZ4_SRCS ${LZ4_SRCS_LIB} ${SRC_DIR}bench.c ${SRC_DIR}lz4demo.c )
-set(FIZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzzer.c)
+set(LZ4_SRCS ${LZ4_SRCS_LIB} ${SRC_DIR}xxhash.c ${SRC_DIR}bench.c ${SRC_DIR}lz4c.c )
+set(FUZZER_SRCS ${SRC_DIR}lz4.c ${SRC_DIR}lz4hc.c ${SRC_DIR}lz4.h ${SRC_DIR}fuzzer.c)
# EXECUTABLES FOR 32 Bit and 64 versions
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "64bit")
- add_executable(lz4demo32 ${LZ4_SRCS})
- install(TARGETS lz4demo32 RUNTIME DESTINATION "./")
-SET_TARGET_PROPERTIES(lz4demo32 PROPERTIES
+ add_executable(lz4c32 ${LZ4_SRCS})
+ install(TARGETS lz4c32 RUNTIME DESTINATION "./")
+SET_TARGET_PROPERTIES(lz4c32 PROPERTIES
COMPILE_FLAGS PROPERTIES COMPILE_FLAGS "-m32 -Os" LINK_FLAGS "-m32")
endif()
-add_executable(lz4demo ${LZ4_SRCS})
-install(TARGETS lz4demo RUNTIME DESTINATION "./")
+add_executable(lz4c ${LZ4_SRCS})
+install(TARGETS lz4c RUNTIME DESTINATION "./")
-add_executable(fuzzer ${FIZZER_SRCS})
+add_executable(fuzzer ${FUZZER_SRCS})
install(TARGETS fuzzer RUNTIME DESTINATION "./")
#target_link_libraries(lz4 ${LZ4_SRCS_LIB})
|