Skip to content

Commit 07cb98d

Browse files
committed
Make compatible with modern CMake
1 parent dd3f658 commit 07cb98d

2 files changed

Lines changed: 4 additions & 4 deletions

File tree

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2103,8 +2103,8 @@ ZLIB_DOWNLOAD_BASE ?= http://zlib.net
21032103
BZIP2_VER ?= 1.0.8
21042104
BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
21052105
BZIP2_DOWNLOAD_BASE ?= http://sourceware.org/pub/bzip2
2106-
SNAPPY_VER ?= 1.1.8
2107-
SNAPPY_SHA256 ?= 16b677f07832a612b0836178db7f374e414f94657c138e6993cbfc5dcc58651f
2106+
SNAPPY_VER ?= 1.2.2
2107+
SNAPPY_SHA256 ?= 90f74bc1fbf78a6c56b3c4a082a05103b3a56bb17bca1a27e052ea11723292dc
21082108
SNAPPY_DOWNLOAD_BASE ?= https://github.com/google/snappy/archive
21092109
LZ4_VER ?= 1.9.4
21102110
LZ4_SHA256 ?= 0b0e3aa07c8c063ddf40b082bdf7e37a1562bda40a0ff5272957f3e987e0e54b
@@ -2197,7 +2197,7 @@ libsnappy.a: snappy-$(SNAPPY_VER).tar.gz
21972197
-rm -rf snappy-$(SNAPPY_VER)
21982198
tar xvzf snappy-$(SNAPPY_VER).tar.gz
21992199
mkdir snappy-$(SNAPPY_VER)/build
2200-
cd snappy-$(SNAPPY_VER)/build && CFLAGS='$(ARCHFLAG) ${JAVA_STATIC_DEPS_CCFLAGS} ${EXTRA_CFLAGS}' CXXFLAGS='$(ARCHFLAG) ${JAVA_STATIC_DEPS_CXXFLAGS} ${EXTRA_CXXFLAGS}' LDFLAGS='${JAVA_STATIC_DEPS_LDFLAGS} ${EXTRA_LDFLAGS}' cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON ${PLATFORM_CMAKE_FLAGS} .. && $(MAKE) ${SNAPPY_MAKE_TARGET}
2200+
cd snappy-$(SNAPPY_VER)/build && CFLAGS='$(ARCHFLAG) ${JAVA_STATIC_DEPS_CCFLAGS} ${EXTRA_CFLAGS}' CXXFLAGS='$(ARCHFLAG) ${JAVA_STATIC_DEPS_CXXFLAGS} ${EXTRA_CXXFLAGS}' LDFLAGS='${JAVA_STATIC_DEPS_LDFLAGS} ${EXTRA_LDFLAGS}' cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DSNAPPY_BUILD_BENCHMARKS=OFF -DSNAPPY_BUILD_TESTS=OFF ${PLATFORM_CMAKE_FLAGS} .. && $(MAKE) ${SNAPPY_MAKE_TARGET}
22012201
cp snappy-$(SNAPPY_VER)/build/libsnappy.a .
22022202

22032203
lz4-$(LZ4_VER).tar.gz:

java/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cmake_minimum_required(VERSION 3.4)
1+
cmake_minimum_required(VERSION 3.11)
22

33
if(${CMAKE_VERSION} VERSION_LESS "3.11.4")
44
message("Please consider switching to CMake 3.11.4 or newer")

0 commit comments

Comments
 (0)