Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Explicitly require VS2015 or greater #189

Merged
merged 2 commits into from
Nov 11, 2016
Merged

Explicitly require VS2015 or greater #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd1d664
Explicitly require VS2015 or greater
jslee02 Nov 10, 2016
fb6e77e
Use always endif() instead of endif(CONDITION)
jslee02 Nov 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
if(APPLE)
cmake_minimum_required(VERSION 3.0.00)
elseif(MSVC)
cmake_minimum_required(VERSION 3.1.3)
else()
cmake_minimum_required(VERSION 2.8.12)
endif()
Expand Down
27 changes: 15 additions & 12 deletions CMakeModules/CompilerSettings.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-std=c++11 -W -Wall -g -Wextra -Wpedantic -Wno-missing-field-initializers -Wno-unused-parameter)
if(FCL_TREAT_WARNINGS_AS_ERRORS)
add_definitions(-Werror)
endif(FCL_TREAT_WARNINGS_AS_ERRORS)
endif(CMAKE_COMPILER_IS_GNUCXX)
endif()
endif()

# Clang
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
add_definitions(-std=c++11 -W -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-delete-non-virtual-dtor -Wno-overloaded-virtual -Wno-unknown-pragmas -Wno-deprecated-register)
if(FCL_TREAT_WARNINGS_AS_ERRORS)
add_definitions(-Werror)
endif(FCL_TREAT_WARNINGS_AS_ERRORS)
endif()
endif()

# AppleClang
Expand All @@ -23,16 +23,19 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
add_definitions(-std=c++11 -W -Wall -Wextra -Wno-missing-field-initializers -Wno-unused-parameter -Wno-delete-non-virtual-dtor -Wno-overloaded-virtual -Wno-unknown-pragmas -Wno-deprecated-register)
if(FCL_TREAT_WARNINGS_AS_ERRORS)
add_definitions(-Werror)
endif(FCL_TREAT_WARNINGS_AS_ERRORS)
endif()
endif()

# Visual Studio
if(MSVC OR MSVC90 OR MSVC10)
if(MSVC)
if(MSVC_VERSION VERSION_LESS 1900)
message(FATAL_ERROR "${PROJECT_NAME} requires Visual Studio 2015 or greater.")
endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /EHsc /MP /W1 /bigobj")
if(FCL_TREAT_WARNINGS_AS_ERRORS)
add_definitions(/WX)
endif(FCL_TREAT_WARNINGS_AS_ERRORS)
endif(MSVC OR MSVC90 OR MSVC10)
endif()
endif()

# Intel
if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
Expand All @@ -51,8 +54,8 @@ if(IS_ICPC)
set(CMAKE_LINKER "xild" CACHE STRING "Intel linker" FORCE)
if(FCL_TREAT_WARNINGS_AS_ERRORS)
add_definitions(-Werror)
endif(FCL_TREAT_WARNINGS_AS_ERRORS)
endif(IS_ICPC)
endif()
endif()

# XL
if(CMAKE_CXX_COMPILER_ID STREQUAL "XL")
Expand All @@ -64,15 +67,15 @@ if(IS_XLC)
add_definitions(-std=c++11 -qpic -q64 -qmaxmem=-1)
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -q64")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -q64")
endif(IS_XLC)
endif()

# MinGW
if((CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC) AND NOT MINGW)
add_definitions(-fPIC)
if(FCL_TREAT_WARNINGS_AS_ERRORS)
add_definitions(-Werror)
endif(FCL_TREAT_WARNINGS_AS_ERRORS)
endif((CMAKE_COMPILER_IS_GNUCXX OR IS_ICPC) AND NOT MINGW)
endif()
endif()

# Set rpath http://www.paraview.org/Wiki/CMake_RPATH_handling
set(CMAKE_SKIP_BUILD_RPATH FALSE)
Expand Down