ENH: prefix ossim include with ossim dir

Testing/Code/IO/otbImageKeywordlist.cxx

@@ -23,11 +23,12 @@
 #include "otbMacro.h"
 #include "otbImageKeywordlist.h"
 
-#include "base/ossimKeywordlist.h"
-#include "projection/ossimProjection.h"
-#include "projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/base/ossimKeywordlist.h"
+#include "ossim/projection/ossimProjection.h"
+#include "ossim/projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/base/ossimFilename.h"
+
 #include "ossim/ossimPluginProjectionFactory.h"
-#include "base/ossimFilename.h"
 
 int otbImageKeywordlist(int argc, char* argv[])
 {

Testing/Code/IO/otbOssimJpegFileRessourceLeakTest.cxx

@@ -15,12 +15,13 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
-#include <imaging/ossimImageHandler.h>
-#include <imaging/ossimImageHandlerRegistry.h>
-#include <base/ossimFilename.h>
 #include <stdlib.h>
 #include <iostream>
 
+#include <ossim/imaging/ossimImageHandler.h>
+#include <ossim/imaging/ossimImageHandlerRegistry.h>
+#include <ossim/base/ossimFilename.h>
+
 // This test demonstrate that handler->close() does not release the file descriptor for jpeg files.
 
 int otbOssimJpegFileRessourceLeakTest(int argc, char * argv[])

Testing/Code/Projections/CMakeLists.txt

@@ -1642,6 +1642,13 @@ otbCreateProjectionWithOTB.cxx
 )
 ENDIF(NOT OTB_TESTING_STANDALONE)
 
+IF(OTB_USE_EXTERNAL_OSSIM)
+  INCLUDE_DIRECTORIES( ${OSSIM_INCLUDE_DIR} )
+ELSE(OTB_USE_EXTERNAL_OSSIM)
+  INCLUDE_DIRECTORIES( ${OTB_SOURCE_DIR}/Utilities/otbossim/include
+                       ${OTB_BINARY_DIR}/Utilities/otbossim/include )
+ENDIF(OTB_USE_EXTERNAL_OSSIM)
+
 OTB_ADD_EXECUTABLE(otbProjectionsTests1 "${Projections_SRCS1}" "OTBProjections;OTBIO;OTBTesting")
 OTB_ADD_EXECUTABLE(otbProjectionsTests2 "${Projections_SRCS2}" "OTBProjections;OTBIO;OTBTesting")
 OTB_ADD_EXECUTABLE(otbProjectionsTests3 "${Projections_SRCS3}" "OTBProjections;OTBIO;OTBTesting")

Testing/Code/Projections/otbCreateProjectionWithOSSIM.cxx

@@ -45,10 +45,10 @@
 
 #include "otbInverseSensorModel.h"
 
-#include "imaging/ossimImageHandler.h"
-#include "base/ossimKeywordlist.h"
-#include "imaging/ossimImageHandlerRegistry.h"
-#include "projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/imaging/ossimImageHandler.h"
+#include "ossim/base/ossimKeywordlist.h"
+#include "ossim/imaging/ossimImageHandlerRegistry.h"
+#include "ossim/projection/ossimProjectionFactoryRegistry.h"
 
 int otbCreateProjectionWithOSSIM(int argc, char* argv[])
 {

Testing/Code/Projections/otbCreateProjectionWithOTB.cxx

@@ -45,10 +45,10 @@
 
 #include "otbInverseSensorModel.h"
 
-#include "base/ossimKeywordlist.h"
-#include "base/ossimGpt.h"
-#include "projection/ossimProjectionFactoryRegistry.h"
-#include "imaging/ossimImageHandlerRegistry.h"
+#include "ossim/base/ossimKeywordlist.h"
+#include "ossim/base/ossimGpt.h"
+#include "ossim/projection/ossimProjectionFactoryRegistry.h"
+#include "ossim/imaging/ossimImageHandlerRegistry.h"
 
 int otbCreateProjectionWithOTB(int argc, char* argv[])
 {

Testing/Code/Projections/otbOssimElevManagerTest.cxx

@@ -14,11 +14,11 @@
   PURPOSE.  See the above copyright notices for more information.
 
 =========================================================================*/
+#include "ossim/elevation/ossimElevManager.h"
+#include "ossim/base/ossimFilename.h"
 
 #include "otbImage.h"
 #include "otbImageFileWriter.h"
-#include "elevation/ossimElevManager.h"
-#include "base/ossimFilename.h"
 #include "itkImageRegionIteratorWithIndex.h"
 
 int otbOssimElevManagerTest(int argc, char* argv[])

Testing/Code/Projections/otbOssimElevManagerTest2.cxx

@@ -19,8 +19,9 @@
 #include <fstream>
 #include <cstdlib>
 
-#include "elevation/ossimElevManager.h"
-#include "base/ossimFilename.h"
+#include "ossim/elevation/ossimElevManager.h"
+#include "ossim/base/ossimFilename.h"
+
 #include "itkPoint.h"
 
 int otbOssimElevManagerTest2(int argc, char* argv[])

Testing/Code/Projections/otbOssimElevManagerTest4.cxx

@@ -20,8 +20,8 @@
 #include <fstream>
 #include <sstream>
 
-#include "elevation/ossimElevManager.h"
-#include "base/ossimFilename.h"
+#include "ossim/elevation/ossimElevManager.h"
+#include "ossim/base/ossimFilename.h"
 
 int otbOssimElevManagerTest4(int argc, char* argv[])
 {