diff --git a/CMakeLists.txt b/CMakeLists.txt
index 02d7152dafb92c4c02a2791c8c39c51ab88c510e..b3af063c9e7b35236b72f4656c3e4b92756b0bb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -509,11 +509,15 @@ ENDIF(OTB_USE_PQXX)
 # Boost Library
 #-------------------------------
 FIND_PACKAGE(Boost)
-IF(Boost_FOUND AND ( NOT (${Boost_MINOR_VERSION} EQUAL 40)))
-  OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." ON)
-ELSE(Boost_FOUND AND ( NOT (${Boost_MINOR_VERSION} EQUAL 40)))
+IF(Boost_FOUND)
+  IF (NOT (${Boost_MINOR_VERSION} EQUAL 40))
+    OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." ON)
+  ELSE (NOT (${Boost_MINOR_VERSION} EQUAL 40))
+    OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." OFF)
+  ENDIF (NOT (${Boost_MINOR_VERSION} EQUAL 40))
+ELSE(Boost_FOUND)
   OPTION(OTB_USE_EXTERNAL_BOOST "Use an outside build of Boost." OFF)
-ENDIF(Boost_FOUND AND ( NOT (${Boost_MINOR_VERSION} EQUAL 40)))
+ENDIF(Boost_FOUND)
 # Option for internal/external BOOST
 MARK_AS_ADVANCED(OTB_USE_EXTERNAL_BOOST)