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

Add some more checks to the SILENCE_TR1 warnings for Ceevis unittests/gtest

Browse Source
This commit is contained in:
Gaute Lindkvist 2018-11-27 09:55:22 +01:00
parent a7e76679e1
commit 398a59d0a6
7 changed files with 35 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Fwk/VizFwk/Tests/LibGuiQt_UnitTests/CMakeLists.txt
View File

@ -41,7 +41,11 @@ if (Qt5Core_FOUND)
endif(Qt5Core_FOUND) endif(Qt5Core_FOUND)
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) 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)
endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES}) add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CEE_PLATFORM_LIBS}) target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CEE_PLATFORM_LIBS})

6
Fwk/VizFwk/Tests/LibIo_UnitTests/CMakeLists.txt
View File

@ -20,7 +20,11 @@ cvfXml-Test.cpp
LibIo_UnitTests.cpp LibIo_UnitTests.cpp
) )
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) 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)
endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES}) add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${CEE_PLATFORM_LIBS} ) target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${CEE_PLATFORM_LIBS} )

6
Fwk/VizFwk/Tests/LibRegGrid2D_UnitTests/CMakeLists.txt
View File

@ -25,7 +25,11 @@ cvfRegGrid2DGeometry-Test.cpp
LibRegGrid2D_UnitTests.cpp LibRegGrid2D_UnitTests.cpp
) )
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) 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)
endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES}) add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS}) target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})

6
Fwk/VizFwk/Tests/LibRender_UnitTests/CMakeLists.txt
View File

@ -49,7 +49,11 @@ cvfViewport-Test.cpp
LibRender_UnitTests.cpp LibRender_UnitTests.cpp
) )
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) 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)
endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES}) add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS}) target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})

6
Fwk/VizFwk/Tests/LibStructGrid_UnitTests/CMakeLists.txt
View File

@ -23,7 +23,11 @@ cvfRectilinearGrid-Test.cpp
LibStructGrid_UnitTests.cpp LibStructGrid_UnitTests.cpp
) )
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) 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)
endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES}) add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS}) target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})

6
Fwk/VizFwk/Tests/LibUtilities_UnitTests/CMakeLists.txt
View File

@ -26,7 +26,11 @@ cvfuTestSnippet-Test.cpp
LibUtilities_UnitTests.cpp LibUtilities_UnitTests.cpp
) )
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) 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)
endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES}) add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS}) target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})

6
Fwk/VizFwk/Tests/LibViewing_UnitTests/CMakeLists.txt
View File

@ -37,7 +37,11 @@ cvfScene-Test.cpp
LibViewing_UnitTests.cpp LibViewing_UnitTests.cpp
) )
add_definitions(-D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING) 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)
endif()
add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES}) add_executable(${PROJECT_NAME} ${CEE_SOURCE_FILES})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS}) target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})