Skip to content

Commit 8957d6e

Browse files
committed
Bump minimum cmake version to 3.5 to avoid deprecation warning
Building msgpack gives currently gives the following warning: "CMake Deprecation Warning at CMakeLists.txt:1 (CMAKE_MINIMUM_REQUIRED): Compatibility with CMake < 3.5 will be removed from a future version of CMake. Update the VERSION argument <min> value or use a ...<max> suffix to tell CMake that the project does not need compatibility with older versions." Reuse same solution as fc18087 as the policy CMP0060 introduced in cmake 3.3 causes problems with when linking for 32-bit otherwise.
1 parent 3a41b24 commit 8957d6e

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

CMakeLists.txt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
1-
CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)
2-
3-
IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
4-
(CMAKE_VERSION VERSION_EQUAL 3.1))
5-
CMAKE_POLICY(SET CMP0054 NEW)
6-
ENDIF ()
1+
if(${CMAKE_VERSION} VERSION_GREATER "3.4")
2+
CMAKE_MINIMUM_REQUIRED (VERSION 3.5)
3+
else()
4+
CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)
5+
IF ((CMAKE_VERSION VERSION_GREATER 3.1) OR
6+
(CMAKE_VERSION VERSION_EQUAL 3.1))
7+
CMAKE_POLICY(SET CMP0054 NEW)
8+
ENDIF ()
9+
endif()
710

811
OPTION (MSGPACK_BUILD_TESTS "Build msgpack tests." OFF)
912
OPTION (MSGPACK_GEN_COVERAGE "Enable running gcov to get a test coverage report." OFF)
@@ -38,7 +41,7 @@ IF (BIGENDIAN)
3841
SET(MSGPACK_ENDIAN_LITTLE_BYTE 0)
3942
ELSE ()
4043
SET(MSGPACK_ENDIAN_BIG_BYTE 0)
41-
SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
44+
SET(MSGPACK_ENDIAN_LITTLE_BYTE 1)
4245
ENDIF ()
4346

4447
CONFIGURE_FILE (

ci/build_cmake.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ if [ "${ARCH}" == "32" ]
2020
then
2121
export BIT32="ON"
2222
export ARCH_FLAG="-m32"
23+
ZLIB32="-DZLIB_LIBRARY=/usr/lib32/libz.a"
2324
else
2425
export BIT32="OFF"
2526
export ARCH_FLAG="-m64"
2627
fi
2728

28-
cmake -DMSGPACK_BUILD_TESTS=ON -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS} ${SAN}" -DCMAKE_C_FLAGS="${CFLAGS} ${SAN}" ..
29+
cmake -DMSGPACK_BUILD_TESTS=ON -DMSGPACK_32BIT=${BIT32} -DBUILD_SHARED_LIBS=${SHARED} -DMSGPACK_CHAR_SIGN=${CHAR_SIGN} -DCMAKE_CXX_FLAGS="${ARCH_FLAG} ${CXXFLAGS} ${SAN}" -DCMAKE_C_FLAGS="${CFLAGS} ${SAN}" ${ZLIB32} ..
2930

3031
ret=$?
3132
if [ $ret -ne 0 ]

example/cmake/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.0)
1+
cmake_minimum_required (VERSION 3.5)
22
project (example)
33

44
if(EXAMPLE_MSGPACK_EMBEDDED)

0 commit comments

Comments
 (0)