SuperBuild: ENH: pipe logs for all projects except OTB

SuperBuild/CMake/External_expat.cmake

@@ -35,6 +35,9 @@ ExternalProject_Add(EXPAT
   -DBUILD_tests:BOOL=OFF
   -DBUILD_tools:BOOL=OFF
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 SUPERBUILD_UPDATE_CMAKE_VARIABLES(EXPAT FALSE)

SuperBuild/CMake/External_fftw.cmake

@@ -54,6 +54,7 @@ ExternalProject_Add(FFTWF
   --disable-fortran
   --disable-dependency-tracking
   DEPENDS ${FFTW_DEPENDENCIES}
+  LOG_CONFIGURE 1
   LOG_BUILD 1
   LOG_INSTALL 1
   )
@@ -80,6 +81,7 @@ ExternalProject_Add(FFTWD
   --disable-fortran
   --disable-dependency-tracking
   DEPENDS FFTWF
+  LOG_CONFIGURE 1
   LOG_BUILD 1
   LOG_INSTALL 1  
   )

SuperBuild/CMake/External_freetype.cmake

@@ -39,6 +39,9 @@ ExternalProject_Add(FREETYPE
   ${SB_CMAKE_CACHE_ARGS}
   ${FREETYPE_SB_CONFIG}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 set(_SB_FREETYPE_INCLUDE_DIRS ${SB_INSTALL_PREFIX}/include/freetype2)

SuperBuild/CMake/External_geos.cmake

@@ -35,6 +35,9 @@ ExternalProject_Add(GEOS
    -DGEOS_ENABLE_TESTS:BOOL=OFF
    PATCH_COMMAND ${GEOS_PATCH_COMMAND}
    CMAKE_COMMAND ${GEOS_CMAKE_COMMAND}
+   LOG_CONFIGURE 1
+   LOG_BUILD 1
+   LOG_INSTALL 1
    )
 
 # Patch still needed with version 3.6.1 to avoid error during CMake configuration

SuperBuild/CMake/External_glew.cmake

@@ -31,6 +31,9 @@ ExternalProject_Add(GLEW
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
   INSTALL_DIR ${SB_INSTALL_PREFIX}
   CONFIGURE_COMMAND ${SB_CMAKE_COMMAND} ${SB_CMAKE_CACHE_ARGS} -DBUILD_UTILS:BOOL=OFF ${GLEW_SB_SRC}/build/cmake/
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 SUPERBUILD_PATCH_SOURCE(GLEW)

SuperBuild/CMake/External_glfw.cmake

@@ -35,4 +35,7 @@ ExternalProject_Add(GLFW
   -DGLFW_BUILD_DOCS:BOOL=OFF
   -DGLFW_BUILD_TESTS:BOOL=OFF
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )

SuperBuild/CMake/External_glut.cmake

@@ -53,6 +53,9 @@ ExternalProject_Add(GLUT
   DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
   PATCH_COMMAND ${GLUT_PATCH_COMMAND}
   CONFIGURE_COMMAND ${GLUT_CONFIGURE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 set(_SB_GLUT_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)

SuperBuild/CMake/External_itk.cmake

@@ -180,6 +180,9 @@ ExternalProject_Add(ITK
   ${ITK_SB_CONFIG}
   DEPENDS ${ITK_DEPENDENCIES}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 SUPERBUILD_PATCH_SOURCE(ITK)

SuperBuild/CMake/External_libkml.cmake

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

SuperBuild/CMake/External_opencv.cmake

@@ -100,6 +100,9 @@ ExternalProject_Add(OPENCV
   ${OPENCV_SB_CONFIG}
   DEPENDS ${OPENCV_DEPENDENCIES}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 

SuperBuild/CMake/External_openjpeg.cmake

@@ -56,6 +56,9 @@ ExternalProject_Add(OPENJPEG
   ${OPENJPEG_SB_CONFIG}
   DEPENDS ${OPENJPEG_DEPENDENCIES}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 SUPERBUILD_UPDATE_CMAKE_VARIABLES(OPENJPEG FALSE)

SuperBuild/CMake/External_openthreads.cmake

@@ -37,6 +37,9 @@ ExternalProject_Add(OPENTHREADS
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy
   ${CMAKE_SOURCE_DIR}/patches/OPENTHREADS/CMakeLists.txt
   ${OPENTHREADS_SB_SRC}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 set(_SB_OPENTHREADS_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)

SuperBuild/CMake/External_ossim.cmake

@@ -67,6 +67,9 @@ ExternalProject_Add(OSSIM
   ${OSSIM_SB_CONFIG}
   DEPENDS ${OSSIM_DEPENDENCIES}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 ExternalProject_Add_Step(OSSIM patch_no_cmakelists

SuperBuild/CMake/External_png.cmake

@@ -48,6 +48,9 @@ ExternalProject_Add(PNG
   -DSKIP_INSTALL_EXECUTABLES:BOOL=OFF
   ${PNG_SB_CONFIG}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 set(_SB_PNG_PNG_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
 

SuperBuild/CMake/External_proj.cmake

@@ -22,48 +22,23 @@ INCLUDE_ONCE_MACRO(PROJ)
 
 SETUP_SUPERBUILD(PROJ)
 
-# if(MSVC)
-#   ExternalProject_Add(PROJ
-#     PREFIX PROJ
-#     URL "http://download.osgeo.org/proj/proj-4.8.0.tar.gz"
-#     URL_MD5 d815838c92a29179298c126effbb1537
-#     SOURCE_DIR ${PROJ_SB_SRC}
-#     BINARY_DIR ${PROJ_SB_SRC}
-#     INSTALL_DIR ${SB_INSTALL_PREFIX}
-#     DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-#     CONFIGURE_COMMAND ""
-#     BUILD_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc
-#     INSTALL_COMMAND nmake /f ${PROJ_SB_SRC}/makefile.vc install-all INSTDIR=${SB_INSTALL_PREFIX_NATIVE}
-#     )
-
-# else()
-
-#   if(APPLE)
-#     set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD} LDFLAGS=-headerpad_max_install_names)
-#   else()
-#     set(PROJ_SB_ENV_CONFIGURE_CMD ${SB_ENV_CONFIGURE_CMD})
-#   endif()
-
-  ExternalProject_Add(PROJ
-    PREFIX PROJ
-    URL "http://download.osgeo.org/proj/proj-4.9.3.tar.gz"
-    URL_MD5 d598336ca834742735137c5674b214a1
-    BINARY_DIR ${PROJ_SB_SRC}
-    INSTALL_DIR ${SB_INSTALL_PREFIX}
-    DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
-    CMAKE_CACHE_ARGS
-    ${SB_CMAKE_CACHE_ARGS}
-    -DBUILD_LIBPROJ_SHARED:BOOL=ON
-    -DPROJ_LIB_SUBDIR:STRING=lib
-    -DPROJ_INCLUDE_SUBDIR:STRING=include
-    CMAKE_COMMAND ${SB_CMAKE_COMMAND}
-    )
-
-  
-
-# endif()
-
-# SUPERBUILD_PATCH_SOURCE(PROJ)
+ExternalProject_Add(PROJ
+  PREFIX PROJ
+  URL "http://download.osgeo.org/proj/proj-4.9.3.tar.gz"
+  URL_MD5 d598336ca834742735137c5674b214a1
+  BINARY_DIR ${PROJ_SB_SRC}
+  INSTALL_DIR ${SB_INSTALL_PREFIX}
+  DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
+  CMAKE_CACHE_ARGS
+  ${SB_CMAKE_CACHE_ARGS}
+  -DBUILD_LIBPROJ_SHARED:BOOL=ON
+  -DPROJ_LIB_SUBDIR:STRING=lib
+  -DPROJ_INCLUDE_SUBDIR:STRING=include
+  CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
+  )
 
 set(_SB_PROJ_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)
 if(WIN32)

SuperBuild/CMake/External_shark.cmake

@@ -46,6 +46,9 @@ ExternalProject_Add(SHARK
   -DENABLE_CBLAS:BOOL=OFF
   ${SHARK_SB_CONFIG}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 set(_SB_Shark_DIR ${SB_INSTALL_PREFIX}/lib/cmake/Shark)

SuperBuild/CMake/External_sqlite.cmake

@@ -33,6 +33,9 @@ ExternalProject_Add(SQLITE
   PATCH_COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/patches/SQLITE ${SQLITE_SB_SRC}
   CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 set(_SB_SQLITE_INCLUDE_DIR ${SB_INSTALL_PREFIX}/include)

SuperBuild/CMake/External_tinyxml.cmake

@@ -35,6 +35,9 @@ ExternalProject_Add(TINYXML
   ${TINYXML_SB_SRC}
   CMAKE_CACHE_ARGS ${SB_CMAKE_CACHE_ARGS}
   CMAKE_COMMAND ${SB_CMAKE_COMMAND}
+  LOG_CONFIGURE 1
+  LOG_BUILD 1
+  LOG_INSTALL 1
   )
 
 SUPERBUILD_UPDATE_CMAKE_VARIABLES(TINYXML FALSE)