From: maier Date: Fri, 1 Mar 2013 13:29:02 +0000 (+0000) Subject: Finish build_test target X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d478523feb61953401aa8a0e5ac65d9f3fe10d1;p=dealii-svn.git 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 dca43691cf..070fa291ea 100644 --- 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 290a28c799..80edae76c4 100644 --- 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 8994a11fdf..1752c8acc0 100644 --- 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")