COMP: do not mix include dirs (Common should not include Application)

CMakeLists.txt

@@ -101,24 +101,6 @@ endif(OTB_DATA_USE_LARGEINPUT)
 # set the Buildname for the dashboard
 set(BUILDNAME "${BUILDNAME}" CACHE STRING "Name of build on the dashboard.")
 
-#----------------------------------------------------------------------------
-# Include directories
-set(Monteverdi2_INCLUDE_DIRS
-  # ${Monteverdi2_SOURCE_DIR}/Code/
-  ${Monteverdi2_SOURCE_DIR}/Code/Common
-  ${Monteverdi2_SOURCE_DIR}/Code/Application
-  ${Monteverdi2_SOURCE_DIR}/Data/Icons
-
-  # For moc files
-  ${Monteverdi2_BINARY_DIR}/Code/Common
-  ${Monteverdi2_BINARY_DIR}/Code/Application
-
-  # For ConfigureMonteverdi2.h
-  ${Monteverdi2_BINARY_DIR}
-  )
-
-include_directories(${Monteverdi2_INCLUDE_DIRS})
-
 #----------------------------------------------------------------------------
 # Installation directories:
 # Monteverdi2_INSTALL_BIN_DIR          - binary dir (executables)

Code/Application/CMakeLists.txt

@@ -23,6 +23,19 @@ set( Application_RESOURCES
        mvdMainWindow.qrc
 )
 
+include_directories(
+  ${Monteverdi2_BINARY_DIR}
+  
+  ${Monteverdi2_SOURCE_DIR}/Code/Common
+  
+  ${Monteverdi2_SOURCE_DIR}/Code/Application
+  ${Monteverdi2_BINARY_DIR}/Code/Application
+  
+  ${Monteverdi2_SOURCE_DIR}/Data/Icons
+  
+  
+)
+
 #############################################################################
 # Qt4 wrapped files.
 qt4_wrap_cpp( Application_SRC_MOC ${Application_HEADERS_MOC} )

Code/Common/CMakeLists.txt

@@ -78,6 +78,12 @@ set( Common_FORMS
 set( Common_RESOURCES
 )
 
+include_directories(
+  ${Monteverdi2_BINARY_DIR}
+  ${Monteverdi2_SOURCE_DIR}/Code/Common
+  ${Monteverdi2_BINARY_DIR}/Code/Common
+)
+
 #############################################################################
 # Qt4 wrapped files.
 qt4_wrap_cpp( Common_SRC_MOC ${Common_HEADERS_MOC} )