diff --git a/Fwk/VizFwk/Tests/LibGuiQt_UnitTests/CMakeLists.txt b/Fwk/VizFwk/Tests/LibGuiQt_UnitTests/CMakeLists.txt
index b1f02d39cf..12bf0759d6 100644
--- a/Fwk/VizFwk/Tests/LibGuiQt_UnitTests/CMakeLists.txt
+++ b/Fwk/VizFwk/Tests/LibGuiQt_UnitTests/CMakeLists.txt
@@ -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})
 
diff --git a/Fwk/VizFwk/Tests/LibIo_UnitTests/CMakeLists.txt b/Fwk/VizFwk/Tests/LibIo_UnitTests/CMakeLists.txt
index ae3727b31b..d9ce18323a 100644
--- a/Fwk/VizFwk/Tests/LibIo_UnitTests/CMakeLists.txt
+++ b/Fwk/VizFwk/Tests/LibIo_UnitTests/CMakeLists.txt
@@ -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} )
 
diff --git a/Fwk/VizFwk/Tests/LibRegGrid2D_UnitTests/CMakeLists.txt b/Fwk/VizFwk/Tests/LibRegGrid2D_UnitTests/CMakeLists.txt
index 631d84d460..88260c2114 100644
--- a/Fwk/VizFwk/Tests/LibRegGrid2D_UnitTests/CMakeLists.txt
+++ b/Fwk/VizFwk/Tests/LibRegGrid2D_UnitTests/CMakeLists.txt
@@ -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})
 
diff --git a/Fwk/VizFwk/Tests/LibRender_UnitTests/CMakeLists.txt b/Fwk/VizFwk/Tests/LibRender_UnitTests/CMakeLists.txt
index c32ee3dc6d..6fda5381ab 100644
--- a/Fwk/VizFwk/Tests/LibRender_UnitTests/CMakeLists.txt
+++ b/Fwk/VizFwk/Tests/LibRender_UnitTests/CMakeLists.txt
@@ -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})
 
diff --git a/Fwk/VizFwk/Tests/LibStructGrid_UnitTests/CMakeLists.txt b/Fwk/VizFwk/Tests/LibStructGrid_UnitTests/CMakeLists.txt
index 669bc920b1..ad48954fd1 100644
--- a/Fwk/VizFwk/Tests/LibStructGrid_UnitTests/CMakeLists.txt
+++ b/Fwk/VizFwk/Tests/LibStructGrid_UnitTests/CMakeLists.txt
@@ -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})
 
diff --git a/Fwk/VizFwk/Tests/LibUtilities_UnitTests/CMakeLists.txt b/Fwk/VizFwk/Tests/LibUtilities_UnitTests/CMakeLists.txt
index df796dbfb6..061fbc2466 100644
--- a/Fwk/VizFwk/Tests/LibUtilities_UnitTests/CMakeLists.txt
+++ b/Fwk/VizFwk/Tests/LibUtilities_UnitTests/CMakeLists.txt
@@ -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})
 
diff --git a/Fwk/VizFwk/Tests/LibViewing_UnitTests/CMakeLists.txt b/Fwk/VizFwk/Tests/LibViewing_UnitTests/CMakeLists.txt
index cec8da7fb6..d2f23b36b5 100644
--- a/Fwk/VizFwk/Tests/LibViewing_UnitTests/CMakeLists.txt
+++ b/Fwk/VizFwk/Tests/LibViewing_UnitTests/CMakeLists.txt
@@ -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})