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

Merge pull request #4721 from OPM/disable-warnings-2

Browse Source 
Disable warnings
This commit is contained in:
Magne Sjaastad 2019-09-16 21:38:03 +02:00 committed by GitHub
commit f5d2e594a2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ApplicationCode/CMakeLists.txt
View File

@ -2,6 +2,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (ApplicationCode) project (ApplicationCode)
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
endif()
# Open GL # Open GL
find_package( OpenGL ) find_package( OpenGL )
@ -76,6 +80,11 @@ include_directories(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
) )
################################################################################
# Eigen
################################################################################
include_directories(SYSTEM ${ResInsight_SOURCE_DIR}/ThirdParty/Eigen-Subset)
############################################################################# #############################################################################
# Defining all the source (and header) files # Defining all the source (and header) files
############################################################################# #############################################################################
@ -232,9 +241,21 @@ if (RESINSIGHT_FOUND_HDF5)
FileInterface/RifHdf5Reader.cpp FileInterface/RifHdf5Reader.cpp
) )
add_definitions(-DUSE_HDF5)
if(MSVC)
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
include_directories(${RESINSIGHT_HDF5_DIR}/include)
else()
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
add_definitions(${HDF5_DEFINITIONS})
include_directories(${HDF5_INCLUDE_DIRS})
endif() # MSVC
source_group( "FileInterface" FILES FileInterface/RifHdf5Reader.h FileInterface/RifHdf5Reader.cpp ) source_group( "FileInterface" FILES FileInterface/RifHdf5Reader.h FileInterface/RifHdf5Reader.cpp )
add_definitions(-DUSE_HDF5)
endif() endif()
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING) if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)

14
CMakeLists.txt
View File

@ -164,10 +164,6 @@ mark_as_advanced(FORCE RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING) if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
if(MSVC) if(MSVC)
if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "") if(NOT ${RESINSIGHT_HDF5_DIR} EQUAL "")
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
include_directories(${RESINSIGHT_HDF5_DIR}/include)
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
${RESINSIGHT_HDF5_DIR}/lib/hdf5.lib ${RESINSIGHT_HDF5_DIR}/lib/hdf5.lib
${RESINSIGHT_HDF5_DIR}/lib/hdf5_cpp.lib ${RESINSIGHT_HDF5_DIR}/lib/hdf5_cpp.lib
@ -181,10 +177,6 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
else() else()
find_package(HDF5 COMPONENTS CXX) find_package(HDF5 COMPONENTS CXX)
if (HDF5_FOUND) if (HDF5_FOUND)
add_definitions(-DH5_BUILT_AS_DYNAMIC_LIB)
add_definitions(${HDF5_DEFINITIONS})
include_directories(${HDF5_INCLUDE_DIRS})
list(APPEND EXTERNAL_LINK_LIBRARIES list(APPEND EXTERNAL_LINK_LIBRARIES
${HDF5_LIBRARIES} ${HDF5_LIBRARIES}
) )
@ -198,7 +190,6 @@ if (RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_SOURING)
message( STATUS "Bundling of HDF5 libraries is enabled" ) message( STATUS "Bundling of HDF5 libraries is enabled" )
endif() # RESINSIGHT_HDF5_BUNDLE_LIBRARIES endif() # RESINSIGHT_HDF5_BUNDLE_LIBRARIES
else() else()
message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." ) message( WARNING "Use of HDF5 is enabled, but no HDF5 is found." )
endif() # HDF5_FOUND endif() # HDF5_FOUND
@ -294,11 +285,6 @@ list(APPEND THIRD_PARTY_LIBRARIES
expressionparser expressionparser
) )
################################################################################
# Eigen
################################################################################
include_directories(SYSTEM ThirdParty/Eigen-Subset)
################################################################################ ################################################################################
# clipper # clipper
################################################################################ ################################################################################

4
Fwk/VizFwk/LibCore/CMakeLists.txt
View File

@ -6,6 +6,10 @@ project(LibCore)
# Use our strict compile flags # Use our strict compile flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}")
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
endif()
set(CEE_HEADER_FILES set(CEE_HEADER_FILES
cvfArray.h cvfArray.h
cvfArray.inl cvfArray.inl

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

@ -9,7 +9,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}")
# For now, disable warning about unknown pragmas locally here (due to usage of OpenMP) # For now, disable warning about unknown pragmas locally here (due to usage of OpenMP)
# Probably need to do this more centralized whenever we use OpenMP more extensively # Probably need to do this more centralized whenever we use OpenMP more extensively
if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-unknown-pragmas -Wno-deprecated -Wno-deprecated-declarations")
endif() endif()
# For now, remove pedantic flag for OSX since it clashes with glew # For now, remove pedantic flag for OSX since it clashes with glew

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

@ -6,6 +6,10 @@ project(LibViewing)
# Use our strict compile flags # Use our strict compile flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CEE_STRICT_CXX_FLAGS}")
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
endif()
set(CEE_HEADER_FILES set(CEE_HEADER_FILES
cvfClipPlaneSet.h cvfClipPlaneSet.h
cvfConstantFrameRate.h cvfConstantFrameRate.h

4
ThirdParty/NRLib/CMakeLists.txt vendored
View File

@ -2,6 +2,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (NRLib) project (NRLib)
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
endif()
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/nrlib ${CMAKE_CURRENT_SOURCE_DIR}/nrlib

4
ThirdParty/custom-opm-flowdiag-app/CMakeLists.txt vendored
View File

@ -2,6 +2,10 @@ cmake_minimum_required (VERSION 2.8.12)
project (custom-opm-flowdiag-app) project (custom-opm-flowdiag-app)
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
endif()
include_directories( include_directories(
../custom-opm-flowdiagnostics/opm-flowdiagnostics ../custom-opm-flowdiagnostics/opm-flowdiagnostics
opm-flowdiagnostics-applications opm-flowdiagnostics-applications

4
ThirdParty/custom-opm-flowdiagnostics/CMakeLists.txt vendored
View File

@ -2,6 +2,10 @@ cmake_minimum_required (VERSION 2.8)
project (custom-opm-flowdiagnostics) project (custom-opm-flowdiagnostics)
if (CMAKE_COMPILER_IS_GNUCXX)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated -Wno-deprecated-declarations")
endif()
include_directories( include_directories(
opm-flowdiagnostics opm-flowdiagnostics
) )