OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Require CMake 3.6

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-23 14:26:12 +02:00
parent 9c8b7ac76f
commit f7aed637f8
26 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (ApplicationCode)

2
ApplicationCode/Commands/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (Commands)

2
ApplicationCode/GeoMech/GeoMechDataModel/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (RigGeoMechDataModel)

2
ApplicationCode/GeoMech/OdbReader/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (RifOdbReader)

2
ApplicationCode/GrpcInterface/CMakeLists.cmake
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
set ( SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaGrpcServer.h

2
ApplicationCode/ResultStatisticsCache/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (ResultStatisticsCache)

13
CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
include (CheckCSourceCompiles)
project (ResInsight)
@ -13,11 +13,8 @@ SET(BUILD_SHARED_LIBS OFF CACHE BOOL "ERT: Build shared libraries")
list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
# Use CMake to enforce C++11 when using CMake 3 or newer.
# The check can be removed when the minimum version is 3.
if( (${CMAKE_MAJOR_VERSION} GREATER 3) OR (${CMAKE_MAJOR_VERSION} EQUAL 3))
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
################################################################################
# Setup the main platform defines
@ -27,11 +24,11 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
add_definitions(-DCVF_OSX)
elseif(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /std:c++14")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP")
endif()
if (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
set(CMAKE_CXX_FLAGS "-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat -Wno-unused-parameter -std=c++11")
set(CMAKE_CXX_FLAGS "-DCVF_LINUX -pipe -Wextra -Woverloaded-virtual -Wformat -Wno-unused-parameter")
set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -g3 -O0 -DDEBUG -D_DEBUG")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNO_DEBUG")
endif()

2
Fwk/AppFwk/CommonCode/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (CommonCode)

2
Fwk/AppFwk/cafAnimControl/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafAnimControl)

2
Fwk/AppFwk/cafCommand/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafCommand)

2
Fwk/AppFwk/cafCommandFeatures/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafCommandFeatures)

2
Fwk/AppFwk/cafHexInterpolator/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafHexInterpolator)

2
Fwk/AppFwk/cafPdmCvf/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafPdmCvf)

2
Fwk/AppFwk/cafPdmScripting/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafPdmScripting)

2
Fwk/AppFwk/cafProjectDataModel/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafProjectDataModel)

2
Fwk/AppFwk/cafProjectDataModel/cafPdmCore/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafPdmCore)

2
Fwk/AppFwk/cafProjectDataModel/cafPdmUiCore/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafPdmUiCore)

2
Fwk/AppFwk/cafProjectDataModel/cafPdmXml/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafPdmXml)

2
Fwk/AppFwk/cafTensor/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafTensor)

2
Fwk/AppFwk/cafUserInterface/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafUserInterface)

2
Fwk/AppFwk/cafViewer/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafViewer)

2
Fwk/AppFwk/cafVizExtensions/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required (VERSION 2.8.12)
cmake_minimum_required (VERSION 3.6)
project (cafVizExtensions)

2
Fwk/VizFwk/LibGeometry/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.6)
project(LibGeometry)

2
Fwk/VizFwk/LibGuiQt/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.12)
cmake_minimum_required(VERSION 3.6)
project(LibGuiQt)

2
Fwk/VizFwk/LibRender/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.6)
project(LibRender)

2
Fwk/VizFwk/LibViewing/CMakeLists.txt
View File

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8)
cmake_minimum_required(VERSION 3.6)
project(LibViewing)