COMP: OTB-134/OGR now uses the official GDAL_VERSION_NUM #define

Testing/Code/UtilitiesAdapters/OGRAdapters/CMakeLists.txt

@@ -10,31 +10,37 @@ SET(OGRNon_UT_SRC
 otbOGRDataSourceWrapperIO.cxx
 )
 
-find_package(Boost COMPONENTS filesystem unit_test_framework)
-IF(Boost_FOUND)
+# unit_test_framework is not available in internal boost
+IF(OTB_USE_EXTERNAL_BOOST)
+  find_package(Boost COMPONENTS unit_test_framework)
+  IF(Boost_FOUND)
     MESSAGE(STATUS "Boost_INCLUDE_DIR: ${Boost_INCLUDE_DIR}")
     MESSAGE(STATUS "Boost_LIBRARY_DIRS: ${Boost_LIBRARY_DIRS}")
-    MESSAGE(STATUS "Boost_FILESYSTEM_LIBRARY: ${Boost_FILESYSTEM_LIBRARY}")
+    # MESSAGE(STATUS "Boost_FILESYSTEM_LIBRARY: ${Boost_FILESYSTEM_LIBRARY}")
     MESSAGE(STATUS "Boost_UNIT_TEST_FRAMEWORK_LIBRARY: ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}")
     # MESSAGE(STATUS "Boost_DATE_TIME_LIBRARY: ${Boost_DATE_TIME_LIBRARY}")
-ELSE(Boost_FOUND)
-  MESSAGE(WARNING
-    "Cannot build OTB/OGR UT without Boost.  Please set Boost_DIR.")
-ENDIF(Boost_FOUND)
+  ELSE(Boost_FOUND)
+    MESSAGE(WARNING
+      "Cannot build OTB/OGR UT without Boost.  Please set Boost_DIR.")
+  ENDIF(Boost_FOUND)
 
 
-IF (Boost_UNIT_TEST_FRAMEWORK_FOUND)
-  OTB_ADD_EXECUTABLE(otbOGRTests "${OGRCommon_SRC}" "OTBIO;OTBTesting")
-  TARGET_LINK_LIBRARIES(otbOGRTests OTBOGRAdapters OTBTesting
-    ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
-    )
+  IF (Boost_UNIT_TEST_FRAMEWORK_FOUND)
+    OTB_ADD_EXECUTABLE(otbOGRTests "${OGRCommon_SRC}" "OTBIO;OTBTesting")
+    TARGET_LINK_LIBRARIES(otbOGRTests OTBOGRAdapters OTBTesting
+      ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}
+      )
 
 
-  # -------------  otb::OGRDataSourceWrapper ----------------------------
-  ADD_TEST(coTuOGRDataSourceWrapperNew ${OGR_TESTS}
-    otbOGRDataSourceWrapperNew
-    )
-ENDIF(Boost_UNIT_TEST_FRAMEWORK_FOUND)
+    # -------------  otb::OGRDataSourceWrapper ----------------------------
+    ADD_TEST(coTuOGRDataSourceWrapperNew ${OGR_TESTS}
+      otbOGRDataSourceWrapperNew
+      )
+  ENDIF(Boost_UNIT_TEST_FRAMEWORK_FOUND)
+ELSE(OTB_USE_EXTERNAL_BOOST)
+  MESSAGE(WARNING
+    "Cannot build OTB/OGR UT without Boost. Please install/enable EXTERNAL BOOST.")
+ENDIF(OTB_USE_EXTERNAL_BOOST)
 
 OTB_ADD_EXECUTABLE(otbOGRTestsV "${OGRNon_UT_SRC}" "OTBIO;OTBTesting")
 TARGET_LINK_LIBRARIES(otbOGRTestsV OTBOGRAdapters OTBTesting