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

This commit is contained in:
Gaute Lindkvist committed 2018-11-30 09:47:53 +01:00
1 parent a7e76679e1
commit 398a59d0a6
7 files changed
+35 -7

No files matched your search

@@ -41,7 +41,11 @@ if (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})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${QT_LIBRARIES} ${CEE_PLATFORM_LIBS})
@@ -20,7 +20,11 @@ cvfXml-Test.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})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${CEE_PLATFORM_LIBS} )
@@ -25,7 +25,11 @@ cvfRegGrid2DGeometry-Test.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})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})
@@ -49,7 +49,11 @@ cvfViewport-Test.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})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})
@@ -23,7 +23,11 @@ cvfRectilinearGrid-Test.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})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})
@@ -26,7 +26,11 @@ cvfuTestSnippet-Test.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})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})
@@ -37,7 +37,11 @@ cvfScene-Test.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})
target_link_libraries(${PROJECT_NAME} ${CEE_LIBS} ${OPENGL_LIBRARIES} ${CEE_PLATFORM_LIBS})