Finish build_test target

git-svn-id: https://svn.dealii.org/branches/branch_cmake@28682 0785d39b-7218-0410-832d-ea1e28bc413d

diff --git a/deal.II/GNUmakefile b/deal.II/GNUmakefile
index dca43691cf689d4c1cc2b5f8435f8392a1559d3a..070fa291ea80c7ec1cc43de977e97d0f6306f6a9 100644 (file)
--- a/deal.II/GNUmakefile
+++ b/deal.II/GNUmakefile
@@ -41,6 +41,7 @@ cmake:
 # Target for build tests:
 #
 # Environment variables: CONFIGFILE CMAKE MAKEOPTS LOGDIR TMPDIR
+#
 TMPDIR=/tmp
 CMAKE=cmake
 date:= $(shell date +%s)
@@ -64,10 +65,21 @@ build_test:
        mkdir -p $(logfiledir)
        @echo "AUTOMATED DEAL.II BUILD TEST" | tee $(logfile)
        @echo "BEGIN HEADER `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
+       @svn info . | perl -ne 'print "dealii-feature: revision=$$_\n" if s/Last Changed Rev: //; print "dealii-feature: branch=$$1\n" if m/svn\.dealii\.org\/(.+)\/deal.II/;' | tee -a $(logfile)
+       @echo "dealii-feature: user=$(USER)"
+       @echo "dealii-feature: host=`hostname`"
+       @echo "dealii-feature: configuration=`basename "$(CONFIGFILE)"`
        @echo END HEADER `date -u '+%Y-%m-%d %T'`\n | tee -a $(logfile)
        @echo "BEGIN CONFIGURE OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
        cd $(builddir) && "$(CMAKE)" -C "$(CONFIGFILE)" -DCMAKE_INSTALL_PREFIX=$(installdir) $(PWD) >>$(logfile) 2>&1
        @echo "END CONFIGURE OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
+       @echo "BEGIN CMAKE SYSTEM INFORMATION `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
+       cd $(builddir) && "$(CMAKE)" --system-information >>$(logfile) 2>&1
+       @echo "END CMAKE SYSTEM INFORMATION `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
+       @echo "BEGIN REPORT FEATURES `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
+       cd $(builddir) && make $(MAKEOPTS) report_features >>$(logfile) 2>&1
+       cd $(builddir) && make $(MAKEOPTS) run_report_features | tee -a $(logfile)
+       @echo "END REPORT FEATURES `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
        @echo "BEGIN BUILD INSTALL OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)
        cd $(builddir) && make $(MAKEOPTS) install >>$(logfile) 2>&1
        @echo "END BUILD INSTALL OUTPUT `date -u '+%Y-%m-%d %T'`" | tee -a $(logfile)

diff --git a/deal.II/cmake/scripts/CMakeLists.txt b/deal.II/cmake/scripts/CMakeLists.txt
index 290a28c799ba855704273f264786c25da1f80e8b..80edae76c4d5fa409adddc723e75ca1d8b10b589 100644 (file)
--- a/deal.II/cmake/scripts/CMakeLists.txt
+++ b/deal.II/cmake/scripts/CMakeLists.txt
@@ -29,6 +29,7 @@ IF(DEAL_II_COMPONENT_COMPAT_FILES)
 
   ADD_EXECUTABLE(report_features report_features.cc)
   TARGET_LINK_LIBRARIES(report_features ${DEAL_II_EXTERNAL_LIBRARIES})
+  ADD_CUSTOM_TARGET(run_report_features COMMAND report_features)
 
   INSTALL(TARGETS make_dependencies report_features expand_instantiations
     RUNTIME

diff --git a/deal.II/cmake/setup_finalize.cmake b/deal.II/cmake/setup_finalize.cmake
index 8994a11fdfe72e4f8a5d112db62f387285ff905e..1752c8acc0e529bf2a0348891650702c9e8175a8 100644 (file)
--- a/deal.II/cmake/setup_finalize.cmake
+++ b/deal.II/cmake/setup_finalize.cmake
@@ -65,6 +65,7 @@ FILE(WRITE ${_log}
 #  ${DEAL_II_PACKAGE_NAME} configuration:
 #
 #        CMAKE_BUILD_TYPE:       ${CMAKE_BUILD_TYPE}
+#        BUILD_SHARED_LIBS:      ${BUILD_SHARED_LIBS}
 #        CMAKE_INSTALL_PREFIX:   ${CMAKE_INSTALL_PREFIX}
 #        CMAKE_SOURCE_DIR:       ${CMAKE_SOURCE_DIR} (Version ${DEAL_II_PACKAGE_VERSION})
 #        CMAKE_BINARY_DIR:       ${CMAKE_BINARY_DIR}
@@ -88,6 +89,7 @@ ENDIF()
 IF(CMAKE_BUILD_TYPE MATCHES "Debug")
   FILE(APPEND ${_log} "#        DEAL_II_SHARED_LINKER_FLAGS_DEBUG:   ${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}\n")
 ENDIF()
+FILE(APPEND ${_log} "#        DEAL_II_SHARED_LINKER_FLAGS_DEBUG:   ${DEAL_II_SHARED_LINKER_FLAGS_DEBUG}\n")
 
 IF(NOT DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS)
   FILE(APPEND ${_log} "#\n#  WARNING: DEAL_II_SETUP_DEFAULT_COMPILER_FLAGS is set to OFF\n")