Skip to content

Commit 7f73baa

Browse files
Change cmake_minimum_required to 3.11.0
1 parent 9b12f56 commit 7f73baa

File tree

3 files changed

+4
-7
lines changed

3 files changed

+4
-7
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# refer to the root source directory of the project as ${MFAST_SOURCE_DIR} and
33
# to the root binary directory of the project as ${MFAST_BINARY_DIR}.
44

5-
cmake_minimum_required(VERSION 2.8.12)
5+
cmake_minimum_required(VERSION 3.11.0)
66
project (mFAST CXX)
77

88
# options to build tests, examples and packages

cmake/SetCompilerWarnings.cmake

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# Initialize CXXFLAGS.
2-
if (NOT ${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
3-
set(CMAKE_CXX_FLAGS "-W -Wall ${CMAKE_CXX_FLAGS}")
4-
endif()
52
if (MSVC)
63
add_definitions(/D_SCL_SECURE_NO_WARNINGS /D_CRT_SECURE_NO_WARNINGS)
4+
else()
5+
set(CMAKE_CXX_FLAGS "-W -Wall ${CMAKE_CXX_FLAGS}")
76
endif()

src/mfast/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ if (BUILD_SHARED_LIBS)
3030
target_include_directories(mfast PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/src>)
3131
target_link_libraries(mfast PUBLIC Boost::boost)
3232

33-
if (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.12")
34-
target_compile_definitions(mfast INTERFACE "-DMFAST_DYN_LINK")
35-
endif (NOT "${CMAKE_VERSION}" VERSION_LESS "2.8.12")
33+
target_compile_definitions(mfast INTERFACE "MFAST_DYN_LINK")
3634

3735
if (CMAKE_COMPILER_IS_GNUCXX OR ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang"))
3836
set_target_properties(mfast PROPERTIES COMPILE_FLAGS -fvisibility=hidden)

0 commit comments

Comments
 (0)