From 98da25577264070a43541fc1c24fdb278281f311 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 7 Jan 2019 14:32:29 +0100 Subject: [PATCH] System : Remove TR1 warnings from gtest --- .../cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt | 6 ++++++ .../cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt | 6 ++++++ .../cafProjectDataModel_UnitTests/CMakeLists.txt | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt index 3b2026af03..34063e3bc7 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmCore/cafPdmCore_UnitTests/CMakeLists.txt @@ -10,6 +10,12 @@ else() include(${QT_USE_FILE}) endif(Qt5Core_FOUND) +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) + message("Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") +endif() + include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt index 36693f0e2c..038d9b2727 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafPdmXml/cafPdmXml_UnitTests/CMakeLists.txt @@ -10,6 +10,12 @@ else() include(${QT_USE_FILE}) endif(Qt5Core_FOUND) +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) + message("Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") +endif() + include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp ) diff --git a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt index 99c31d72c3..421c0960cd 100644 --- a/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt +++ b/Fwk/AppFwk/cafProjectDataModel/cafProjectDataModel_UnitTests/CMakeLists.txt @@ -10,6 +10,12 @@ else() include(${QT_USE_FILE}) endif(Qt5Core_FOUND) +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) + message("Add flag to disable warings from gtest - _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING") +endif() + include_directories ( ${CMAKE_CURRENT_SOURCE_DIR} # required for gtest-all.cpp )