diff --git a/CMakeLists.txt b/CMakeLists.txt
index a96b8c63f849bf0dcc26e3e780273fc9e66bc70f..f610fab9150cc51b8910db2e16cce170496da708 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ endif()
 
 foreach(p
     CMP0025 # CMake 3.0
-    CMP0042 # CMake 3.0
+    CMP0042 # CMake 3.0 
     )
   if(POLICY ${p})
     cmake_policy(SET ${p} NEW)
@@ -18,6 +18,12 @@ if(POLICY CMP0046)
   cmake_policy(SET CMP0046 OLD)
 endif()
 
+# TODO Check if OTB cmake is compatible with CMP0054 NEW policy
+# CMP0054 : New policy introduce in CMake 3.1, keep old behaviour for now
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 OLD)
+endif()
+
 project(OTB)
 
 include(CMakeDependentOption)