Merge remote-tracking branch 'origin/release-5.8' into develop

SuperBuild/CMake/External_curl.cmake

@@ -58,6 +58,9 @@ else(UNIX)
     ${CURL_SB_CONFIG}
     DEPENDS ${CURL_DEPENDENCIES}
     CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+    LOG_CONFIGURE 1
+    LOG_BUILD 1
+    LOG_INSTALL 1
     )
 endif()
 

SuperBuild/CMake/External_fftw.cmake

@@ -34,6 +34,8 @@ ExternalProject_Add(FFTWF
   --disable-fortran
   --disable-dependency-tracking
   DEPENDS ${FFTW_DEPENDENCIES}
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 SUPERBUILD_PATCH_SOURCE(FFTWF)
@@ -58,6 +60,8 @@ ExternalProject_Add(FFTWD
   --disable-fortran
   --disable-dependency-tracking
   DEPENDS FFTWF
+  LOG_BUILD 1
+  LOG_INSTALL 1  
   )
 
 

SuperBuild/CMake/External_gdal.cmake

@@ -125,6 +125,8 @@ ExternalProject_Add(GDAL
   CONFIGURE_COMMAND ${GDAL_CONFIGURE_COMMAND}
   BUILD_COMMAND ${GDAL_BUILD_COMMAND}
   INSTALL_COMMAND ${GDAL_INSTALL_COMMAND}
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 SUPERBUILD_PATCH_SOURCE(GDAL)

SuperBuild/CMake/External_geotiff.cmake

@@ -40,8 +40,15 @@ if(UNIX)
     --enable-static=no
     ${GEOTIFF_SB_CONFIG}
     BUILD_COMMAND $(MAKE)
-    INSTALL_COMMAND $(MAKE) install)
+    INSTALL_COMMAND $(MAKE) install
+    LOG_BUILD 1
+    LOG_INSTALL 1
+    )
 
+  # [LOG_CONFIGURE 1]           # Wrap configure in script to log output
+  # [LOG_BUILD 1]               # Wrap build in script to log output
+  # [LOG_TEST 1]                # Wrap test in script to log output
+  # [LOG_INSTALL 1]             # Wrap install in script to log output
   SUPERBUILD_PATCH_SOURCE(GEOTIFF)
 
 else()

SuperBuild/CMake/External_libkml.cmake

@@ -24,6 +24,7 @@ ExternalProject_Add(LIBKML
   CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
   ${LIBKML_SB_CONFIG}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_BUILD 1  
   )
 
 set(_SB_LIBKML_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)

SuperBuild/CMake/External_qt4.cmake

@@ -105,6 +105,9 @@ add_custom_target(QT4-uninstall
     DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
     CONFIGURE_COMMAND ${QT4_CONFIGURE_COMMAND}
     DEPENDS ${QT4_DEPENDENCIES}
+    LOG_CONFIGURE 1    
+    LOG_BUILD 1
+    LOG_INSTALL 1    
     )
 
 

SuperBuild/CMake/External_qwt.cmake

@@ -37,6 +37,9 @@ ExternalProject_Add(QWT
   CONFIGURE_COMMAND ${QWT_SB_CONFIGURE_PROGRAM} ${QWT_SB_BUILD_DIR}/qwt.pro
   BUILD_COMMAND ${QWT_SB_MAKE_PROGRAM}
   INSTALL_COMMAND ${QWT_SB_MAKE_PROGRAM} install
+  LOG_CONFIGURE 1    
+  LOG_BUILD 1
+  LOG_INSTALL 1      
   )
 
 set(_SB_QWT_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)

SuperBuild/Packaging/Files/linux_pkgsetup.in

@@ -95,6 +95,13 @@ fi
 #echo "Creating symbolic links..."
 . ./make_symlinks
 
+
+cat > "$OUT_DIR/bin/qt.conf" << EOF
+[Paths]
+Translations=$OUT_DIR/lib/qt4/translations
+Plugins=$OUT_DIR/lib/qt4/plugins
+EOF
+
 if [ ! -f "$OTB_PYTHON_EXE" ] ; then
     OTB_PYTHON_EXE=$(which python)
 fi