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

Remove Qt build warnings due to macro redefinitions

Browse Source
This commit is contained in:
Gaute Lindkvist 2020-09-24 14:34:58 +02:00
parent 78ba28e916
commit 6dd3bd8c01
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/CMakeLists.txt
View File

@ -37,15 +37,17 @@ CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/ApplicationCode/Adm/RiaVersionInfo.h.cmake
${CMAKE_BINARY_DIR}/Generated/RiaVersionInfo.h ${CMAKE_BINARY_DIR}/Generated/RiaVersionInfo.h
) )
CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/RiuThemesDirectory.h.cmake CONFIGURE_FILE( ${CMAKE_CURRENT_LIST_DIR}/RiuThemesDirectory.h.cmake
${CMAKE_BINARY_DIR}/Generated/RiuThemesDirectory.h ${CMAKE_BINARY_DIR}/Generated/RiuThemesDirectory.h
) )
if (MSVC)
if (MSVC AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)) # Avoid Qt warnings about macro redefinitions for math constants
# VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1 add_definitions(-D_USE_MATH_DEFINES)
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 19.11)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") # VS 2017 : Disable warnings from from gtest code, using deprecated code related to TR1
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
message(STATUS "Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING")
endif()
endif() endif()
include_directories( include_directories(