Skip to content

Commit 2644706

Browse files
committed
Updated cmake minimum required to 3.5-4.0
1 parent 1cde61e commit 2644706

File tree

2 files changed

+3
-11
lines changed

2 files changed

+3
-11
lines changed

CMakeLists.txt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
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()
1+
CMAKE_MINIMUM_REQUIRED (VERSION 3.5...4.0)
102

113
PROJECT (msgpack-cxx LANGUAGES CXX)
124

@@ -164,10 +156,10 @@ IF (MSGPACK_BUILD_TESTS)
164156
MESSAGE(FATAL_ERROR "Test requires -DMSGPACK_USE_BOOST=ON")
165157
ENDIF ()
166158
ENABLE_TESTING ()
159+
INCLUDE (CTest)
167160
# MEMORYCHECK_COMMAND_OPTIONS needs to place prior to CTEST_MEMORYCHECK_COMMAND
168161
SET (MEMORYCHECK_COMMAND_OPTIONS "--leak-check=full --show-leak-kinds=definite,possible --error-exitcode=1")
169162
FIND_PROGRAM (CTEST_MEMORYCHECK_COMMAND NAMES valgrind)
170-
INCLUDE (Dart)
171163
ADD_SUBDIRECTORY (test)
172164
ENDIF ()
173165

cmake/CodeCoverage.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ FUNCTION(SETUP_TARGET_FOR_COVERAGE _targetname _testrunner _outputname)
4848

4949
# Show info where to find the report
5050
ADD_CUSTOM_COMMAND(TARGET ${_targetname} POST_BUILD
51-
COMMAND ;
51+
COMMAND ${CMAKE_COMMAND} -E echo ""
5252
COMMENT "Open ./${_outputname}/index.html in your browser to view the coverage report."
5353
)
5454

0 commit comments

Comments
 (0)