MRG: Merged changeset 78cbd3d7f7e3 into changeset 948c32887615.

CMakeLists.txt

@@ -69,7 +69,22 @@ endif()
 
 #----------------------------------------------------------------------------
 # Orfeo ToolBox
-find_package(OTB REQUIRED)
+#should we follow modularization here or import all OTB Modules?
+
+#NOTE: If any header from an OTB Module which not listed below is added,
+#then below line MUST be updated. At the sametime this ensure only the
+#components/modules listed below are linked via OTB_LIBRARIES
+find_package(OTB REQUIRED
+  COMPONENTS
+  OTBApplicationEngine
+  OTBQtWidget
+  OTBImageIO
+  OTBVectorDataIO
+  OTBTestKernel
+  OTBCarto
+  OTBProjection
+  OTBStatistics)
+
 if(OTB_FOUND)
   include(${OTB_USE_FILE})
 else(OTB_FOUND)
@@ -140,8 +155,8 @@ endif(Mercurial_FOUND)
 #----------------------------------------------------------------------------
 #Build shared libraries for monteverdi
 #By default, import the option from the OTB configuration
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
 
+set(BUILD_SHARED_LIBS ${OTB_BUILD_SHARED})
 #----------------------------------------------------------------------------
 # Configure the default OTB_DATA_ROOT for the location of OTB Data.
 find_path(OTB_DATA_ROOT README-OTB-Data $ENV{OTB_DATA_ROOT})

Packaging/Windows/CMakeLists.txt

@@ -51,14 +51,14 @@ if(NOT OTB_APPS_LIST)
     message(FATAL_ERROR "No OTB-applications detected")
 endif()
 
-# Install the applications 
+# Install the applications
 install(FILES ${OTB_APPS_LIST}
         DESTINATION lib/otb/applications
         COMPONENT Runtime)
 
 # Retrieve the name of all the applications available
 foreach(APP ${OTB_APPS_LIST})
-    string(REPLACE ${OTB_DIR}/applications/ "" APP_NAME ${APP})
+    string(REPLACE ${OTB_DIR}/../../otb/applications/ "" APP_NAME ${APP})
     list(APPEND OTB_APPS_NAME_LIST ${APP_NAME})
 endforeach(APP)
 
@@ -67,7 +67,7 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/BundleFixing.cmake.in
                 ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing.cmake
                 @ONLY)
 
-#Use the configured file with the list of apps 
+#Use the configured file with the list of apps
 # Gather all dlls from which Monteverdi depends, and put them aside the executable
 # For this to work, the necessary DLL must be in PATH
 install(SCRIPT ${CMAKE_CURRENT_BINARY_DIR}/BundleFixing.cmake
@@ -88,7 +88,7 @@ set(MVD2_ADDITIONNAL_DLLS
         ${OSGEO4W_ROOT}/bin/msvcp71.dll
         ${OSGEO4W_ROOT}/bin/msvcr71.dll
         ${OSGEO4W_ROOT}/bin/msvcrt.dll)
-        
+
 # Since an upgrade in OSGeo4W-32bit of libpq (around 2013/10)
 # libpq depends on two additional libs that cmake
 # surprisingly miss during package generation
@@ -118,7 +118,7 @@ install(DIRECTORY ${GDAL_DATA}
 install(FILES ${QT_TRANSLATIONS_FILES}
         DESTINATION  share/qt4/translations
         COMPONENT Resources)
-        
+
 install(FILES ${QT_PLUGINS_DIR}/sqldrivers/qsqlite4.dll
         DESTINATION lib/qt4/plugins/sqldrivers/
         COMPONENT Runtime)
@@ -126,8 +126,7 @@ install(FILES ${QT_PLUGINS_DIR}/sqldrivers/qsqlite4.dll
 install(FILES qt.conf
         DESTINATION  bin
         COMPONENT Resources)
-        
+
 install(FILES ${Monteverdi2_SOURCE_DIR}/Packaging/Windows/monteverdi2.bat
         DESTINATION bin
         COMPONENT Runtime)
-