ENH: regroup dependency management together

CMake/otbIncludeDirectories.cmake

@@ -7,26 +7,6 @@ SET(OTB_INCLUDE_DIRS_SYSTEM "")
 # Include directories from the build tree.
 SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_BINARY_DIR})
 
-
-# Include directories from the Boost build tree.
-IF(OTB_USE_EXTERNAL_BOOST)
-  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-  	${Boost_INCLUDE_DIR} )
-ELSE(OTB_USE_EXTERNAL_BOOST)
-  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-    ${OTB_SOURCE_DIR}/Utilities/BGL
-)
-ENDIF(OTB_USE_EXTERNAL_BOOST)
-
-#-----------------------------------------------------------------------------
-# Include directories from the GDAL build tree.
-SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
-    ${GDAL_INCLUDE_DIR} )
-
-IF(WIN32)
-  SET(OTB_MSINTTYPES_INCLUDE_DIR_BUILDTREE ${OTB_SOURCE_DIR}/Utilities/otbmsinttypes )
-ENDIF(WIN32)
-
 # These directories are always needed.
 SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
   ${OTB_SOURCE_DIR}/Code/BasicFilters
@@ -58,7 +38,6 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
   ${OTB_SOURCE_DIR}/Code/Visualization
   ${OTB_BINARY_DIR}/Code/Visualization
   ${OTB_SOURCE_DIR}/Code/ApplicationEngine
-  ${OTB_MSINTTYPES_INCLUDE_DIR_BUILDTREE}
   ${OTB_SOURCE_DIR}/Utilities/otbsvm
   ${OTB_SOURCE_DIR}/Utilities/otbossimplugins
   ${OTB_SOURCE_DIR}/Utilities/otbossimplugins/ossim
@@ -73,6 +52,22 @@ SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
   ${OTB_SOURCE_DIR}/Utilities/otbconfigfile
 )
 
+IF(OTB_USE_EXTERNAL_BOOST)
+  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+    ${Boost_INCLUDE_DIR} )
+ELSE(OTB_USE_EXTERNAL_BOOST)
+  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+    ${OTB_SOURCE_DIR}/Utilities/BGL )
+ENDIF(OTB_USE_EXTERNAL_BOOST)
+
+SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+    ${GDAL_INCLUDE_DIR} )
+
+IF(WIN32)
+  SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
+      ${OTB_SOURCE_DIR}/Utilities/otbmsinttypes )
+ENDIF(WIN32)
+
 IF(BUILD_APPLICATIONS)
   SET(OTB_INCLUDE_DIRS_BUILD_TREE ${OTB_INCLUDE_DIRS_BUILD_TREE}
     ${OTB_SOURCE_DIR}/Code/Wrappers/CommandLine )
@@ -252,20 +247,6 @@ SET(OTB_INSTALL_INCLUDE_PATH "${CMAKE_INSTALL_PREFIX}${OTB_INSTALL_INCLUDE_DIR}"
 SET(OTB_INCLUDE_RELATIVE_DIRS )
 SET(OTB_INCLUDE_ABSOLUE_DIRS )
 
-#For BOOST header file
-IF(OTB_USE_EXTERNAL_BOOST)
-  SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
-  	${Boost_INCLUDE_DIR} )
-ELSE(OTB_USE_EXTERNAL_BOOST)
-  SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
-        Utilities/BGL)
-ENDIF(OTB_USE_EXTERNAL_BOOST)
-
-
-IF(WIN32)
-  SET(OTB_MSINTTYPES_INCLUDE_RELATIVE_DIR Utilities/otbmsinttypes )
-ENDIF(WIN32)
-
 
 SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
   Common
@@ -298,7 +279,6 @@ SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
   ApplicationEngine
   Utilities
   Utilities/ITK
-  ${OTB_MSINTTYPES_INCLUDE_RELATIVE_DIR}
   Utilities/otbsvm
   Utilities/InsightJournal
   Utilities/otb6S
@@ -317,6 +297,20 @@ IF(BUILD_APPLICATIONS)
     Wrappers/CommandLine )
 ENDIF(BUILD_APPLICATIONS)
 
+#For BOOST header file
+IF(OTB_USE_EXTERNAL_BOOST)
+  SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
+      ${Boost_INCLUDE_DIR} )
+ELSE(OTB_USE_EXTERNAL_BOOST)
+  SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
+      Utilities/BGL)
+ENDIF(OTB_USE_EXTERNAL_BOOST)
+
+IF(WIN32)
+  SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
+      Utilities/otbmsinttypes)
+ENDIF(WIN32)
+
 #For GDAL header file
 SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
   		${GDAL_INCLUDE_DIR} )
@@ -326,8 +320,6 @@ IF(OTB_USE_EXTERNAL_EXPAT)
         SET(OTB_INCLUDE_ABSOLUE_DIRS ${OTB_INCLUDE_ABSOLUE_DIRS}
   	        ${EXPAT_INCLUDE_DIR} )
 ELSE(OTB_USE_EXTERNAL_EXPAT)
-        SET(OTB_INCLUDE_RELATIVE_DIRS ${OTB_INCLUDE_RELATIVE_DIRS}
-                Utilities/otbexpat)
 ENDIF(OTB_USE_EXTERNAL_EXPAT)
 
 #For CURL header file