summaryrefslogtreecommitdiffstats
path: root/cmake_unofficial/CMakeLists.txt
diff options
context:
space:
mode:
authorYann Collet <yann.collet.73@gmail.com>2014-11-04 09:50:17 (GMT)
committerYann Collet <yann.collet.73@gmail.com>2014-11-04 09:50:17 (GMT)
commit4dbd2faebb345e4b9d888135e9adffe500bdbb38 (patch)
tree04973c11b288958d056b9b339c6a6bbd59c109f0 /cmake_unofficial/CMakeLists.txt
parentd01bb4a193338e851e76bd9b80f79bb9bdbc7b31 (diff)
downloadlz4-4dbd2faebb345e4b9d888135e9adffe500bdbb38.zip
lz4-4dbd2faebb345e4b9d888135e9adffe500bdbb38.tar.gz
lz4-4dbd2faebb345e4b9d888135e9adffe500bdbb38.tar.bz2
Added : cmake test
cmake : corrected xxhash path (thanks to j.magnuson)
Diffstat (limited to 'cmake_unofficial/CMakeLists.txt')
-rw-r--r--cmake_unofficial/CMakeLists.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/cmake_unofficial/CMakeLists.txt b/cmake_unofficial/CMakeLists.txt
index fab1946..1d70590 100644
--- a/cmake_unofficial/CMakeLists.txt
+++ b/cmake_unofficial/CMakeLists.txt
@@ -1,9 +1,8 @@
PROJECT(LZ4 C)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "LZ4 compression library")
set(CPACK_PACKAGE_VERSION_MAJOR 1)
-set(CPACK_PACKAGE_VERSION_MINOR 3)
-set(CPACK_PACKAGE_VERSION_PATCH r122)
-#set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_BINARY_DIR}/COPYING_LGPL)
+set(CPACK_PACKAGE_VERSION_MINOR 4)
+set(CPACK_PACKAGE_VERSION_PATCH r124)
set(VERSION_STRING " \"${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}\" ")
include(CPack)
@@ -27,7 +26,7 @@ endif()
set(LZ4_DIR ../)
set(PRG_DIR ../programs/)
set(LZ4_SRCS_LIB ${LZ4_DIR}lz4.c ${LZ4_DIR}lz4hc.c ${LZ4_DIR}lz4.h ${LZ4_DIR}lz4hc.h)
-set(LZ4_SRCS ${PRG_DIR}xxhash.c ${PRG_DIR}bench.c ${PRG_DIR}lz4cli.c ${PRG_DIR}lz4io.c)
+set(LZ4_SRCS ${LZ4_DIR}xxhash.c ${PRG_DIR}bench.c ${PRG_DIR}lz4cli.c ${PRG_DIR}lz4io.c)
if(BUILD_TOOLS AND NOT BUILD_LIBS)
set(LZ4_SRCS ${LZ4_SRCS} ${LZ4_SRCS_LIB})
@@ -72,7 +71,9 @@ endif()
ADD_DEFINITIONS("-Wall")
ADD_DEFINITIONS("-Wextra")
ADD_DEFINITIONS("-Wundef")
+ADD_DEFINITIONS("-Wshadow")
ADD_DEFINITIONS("-Wcast-align")
+ADD_DEFINITIONS("-Wstrict-prototypes")
ADD_DEFINITIONS("-std=c99")
ADD_DEFINITIONS("-DLZ4_VERSION=\"${CPACK_PACKAGE_VERSION_PATCH}\"")
INCLUDE_DIRECTORIES (${LZ4_DIR})