Merge branch 'release-5.8' of https://git.orfeo-toolbox.org/git/otb into release-5.8

Modules/Learning/Supervised/test/tests-libsvm.cmake

@@ -6,7 +6,6 @@ otb_add_test(NAME leTvLibSVMMachineLearningModel COMMAND otbSupervisedTestDriver
 otb_add_test(NAME leTuLibSVMMachineLearningModelNew COMMAND otbSupervisedTestDriver
   otbLibSVMMachineLearningModelNew)
 
-
 otb_add_test(NAME leTvImageClassificationFilterLibSVM COMMAND otbSupervisedTestDriver
   --compare-image ${NOTOL}
   ${BASELINE}/leSVMImageClassificationFilterOutput.tif
@@ -17,11 +16,11 @@ otb_add_test(NAME leTvImageClassificationFilterLibSVM COMMAND otbSupervisedTestD
   ${TEMP}/leImageClassificationFilterLibSVMOutput.tif
   )
 
-otb_add_test(NAME leTuLibSVMMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvLibSVMMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbLibSVMMachineLearningModelCanRead
   ${TEMP}/libsvm_model.txt
   )
-set_property(TEST leTuLibSVMMachineLearningModelCanRead PROPERTY DEPENDS leTvLibSVMMachineLearningModel)
+set_property(TEST leTvLibSVMMachineLearningModelCanRead PROPERTY DEPENDS leTvLibSVMMachineLearningModel)
 
 otb_add_test(NAME leTvLibSVMMachineLearningModelReg COMMAND otbSupervisedTestDriver
   otbLibSVMRegressionTests

Modules/Learning/Supervised/test/tests-opencv.cmake

@@ -115,50 +115,50 @@ otb_add_test(NAME leTvImageClassificationFilterSVM COMMAND otbSupervisedTestDriv
   ${TEMP}/leImageClassificationFilterSVMOutput.tif
   )
 
-otb_add_test(NAME leTuDecisionTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvDecisionTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbDecisionTreeMachineLearningModelCanRead
   ${TEMP}/decisiontree_model.txt
   )
-set_property(TEST leTuDecisionTreeMachineLearningModelCanRead APPEND PROPERTY DEPENDS leTvDecisionTreeMachineLearningModel)
+set_property(TEST leTvDecisionTreeMachineLearningModelCanRead APPEND PROPERTY DEPENDS leTvDecisionTreeMachineLearningModel)
 
-otb_add_test(NAME leTuGradientBoostedTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvGradientBoostedTreeMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbGradientBoostedTreeMachineLearningModelCanRead
   ${TEMP}/gbt_model.txt
   )
-set_property(TEST leTuGradientBoostedTreeMachineLearningModelCanRead PROPERTY DEPENDS leTvGradientBoostedTreeMachineLearningModel)
+set_property(TEST leTvGradientBoostedTreeMachineLearningModelCanRead PROPERTY DEPENDS leTvGradientBoostedTreeMachineLearningModel)
 
-otb_add_test(NAME leTuNormalBayesMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvNormalBayesMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbNormalBayesMachineLearningModelCanRead
   ${TEMP}/normalbayes_model.txt
   )
-set_property(TEST leTuNormalBayesMachineLearningModelCanRead PROPERTY DEPENDS leTvNormalBayesMachineLearningModel)
+set_property(TEST leTvNormalBayesMachineLearningModelCanRead PROPERTY DEPENDS leTvNormalBayesMachineLearningModel)
 
-otb_add_test(NAME leTuANNMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvANNMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbNeuralNetworkMachineLearningModelCanRead
   ${TEMP}/ann_model.txt
   )
-set_property(TEST leTuANNMachineLearningModelCanRead PROPERTY DEPENDS leTvANNMachineLearningModel)
+set_property(TEST leTvANNMachineLearningModelCanRead PROPERTY DEPENDS leTvANNMachineLearningModel)
 
-otb_add_test(NAME leTuSVMMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvSVMMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbSVMMachineLearningModelCanRead
   ${TEMP}/svm_model.txt
   )
-set_property(TEST leTuSVMMachineLearningModelCanRead PROPERTY DEPENDS leTvSVMMachineLearningModel)
+set_property(TEST leTvSVMMachineLearningModelCanRead PROPERTY DEPENDS leTvSVMMachineLearningModel)
 
-otb_add_test(NAME leTuBoostMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvBoostMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbBoostMachineLearningModelCanRead
   ${TEMP}/boost_model.txt
   )
-set_property(TEST leTuBoostMachineLearningModelCanRead PROPERTY DEPENDS leTvBoostMachineLearningModel)
+set_property(TEST leTvBoostMachineLearningModelCanRead PROPERTY DEPENDS leTvBoostMachineLearningModel)
 
-otb_add_test(NAME leTuRandomForestsMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvRandomForestsMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbRandomForestsMachineLearningModelCanRead
   ${TEMP}/rf_model.txt
   )
-set_property(TEST leTuRandomForestsMachineLearningModelCanRead PROPERTY DEPENDS leTvRandomForestsMachineLearningModel)
+set_property(TEST leTvRandomForestsMachineLearningModelCanRead PROPERTY DEPENDS leTvRandomForestsMachineLearningModel)
 
-otb_add_test(NAME leTuKNNMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvKNNMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbKNNMachineLearningModelCanRead
   ${TEMP}/knn_model.txt
   )
-set_property(TEST leTuKNNMachineLearningModelCanRead PROPERTY DEPENDS leTvKNearestNeighborsMachineLearningModel)
+set_property(TEST leTvKNNMachineLearningModelCanRead PROPERTY DEPENDS leTvKNearestNeighborsMachineLearningModel)

Modules/Learning/Supervised/test/tests-shark.cmake

@@ -7,16 +7,16 @@ otb_add_test(NAME leTvSharkRFMachineLearningModel COMMAND otbSupervisedTestDrive
   ${TEMP}/shark_rf_model.txt
   )
 
-otb_add_test(NAME leTuSharkRFMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvSharkRFMachineLearningModelCanRead COMMAND otbSupervisedTestDriver
   otbSharkRFMachineLearningModelCanRead
   ${INPUTDATA}/Classification/otbSharkImageClassificationFilter_RFmodel.txt
   )
 
-otb_add_test(NAME leTuSharkRFMachineLearningModelCanReadFail COMMAND otbSupervisedTestDriver
+otb_add_test(NAME leTvSharkRFMachineLearningModelCanReadFail COMMAND otbSupervisedTestDriver
   otbSharkRFMachineLearningModelCanRead
   ${INPUTDATA}/ROI_QB_MUL_4_svmModel.txt
   )
-set_property(TEST leTuSharkRFMachineLearningModelCanReadFail PROPERTY WILL_FAIL true)
+set_property(TEST leTvSharkRFMachineLearningModelCanReadFail PROPERTY WILL_FAIL true)
 
 
 otb_add_test(NAME leTvImageClassificationFilterSharkFast COMMAND  otbSupervisedTestDriver

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