OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity

Minor compiler fixes

Browse Source
This commit is contained in:
Magne Sjaastad 2020-08-28 06:28:12 +02:00
parent 0747547aaf
commit 011174153e
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ThirdParty/custom-opm-common/custom-opm-parser-tests/CMakeLists.txt vendored
View File

@ -2,6 +2,16 @@ cmake_minimum_required (VERSION 2.8)
project ( opm-parser-tests )
# Languages and global compiler settings
if(CMAKE_VERSION VERSION_LESS 3.8)
message(WARNING "CMake version does not support c++17, guessing -std=c++17")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
else()
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_EXTENSIONS OFF)
endif()
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11))
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
@ -44,6 +54,6 @@ target_link_libraries ( ${PROJECT_NAME}
)
# Add dependency of Shlwapi.lib for Windows platforms
if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
if (MSVC)
target_link_libraries(${PROJECT_NAME} Shlwapi)
endif()

1
ThirdParty/custom-opm-common/opm-common/src/opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.cpp vendored
View File

@ -20,6 +20,7 @@
#include <stdexcept>
#include <opm/parser/eclipse/EclipseState/Schedule/Network/ExtNetwork.hpp>
#include <iterator>
namespace Opm {
namespace Network {