From f93490a749315370a5a0adbfb417eec4689e7033 Mon Sep 17 00:00:00 2001 From: Matthias Maier Date: Wed, 27 Mar 2013 21:53:42 +0000 Subject: [PATCH] build_test: Bugfix git-svn-id: https://svn.dealii.org/branches/branch_cmake@29090 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/contrib/utilities/build_test | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/deal.II/contrib/utilities/build_test b/deal.II/contrib/utilities/build_test index df46d349ad..da6f16bde8 100755 --- a/deal.II/contrib/utilities/build_test +++ b/deal.II/contrib/utilities/build_test @@ -60,7 +60,7 @@ main: @echo "dealii-feature: configuration=`basename \"$(CONFIGFILE)\"`" | tee -a $(LOGFILE) @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) $(SOURCEDIR) $(PIPEnTRAP) + cd $(builddir) && $(CMAKE) -C "$(CONFIGFILE)" -DCMAKE_INSTALL_PREFIX=$(installdir) $(SOURCEDIR) $(PIPEnTRAP) @echo "END CONFIGURE OUTPUT `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) run_report_features $(PIPEnTRAP) @@ -91,7 +91,7 @@ runsteps:= step-1 step-2 step-3 step-4 step-5 step-6 step-7 step-8 step-9 step-1 %/%: - -cd $(@D) && cmake . >/dev/null 2>&1 + -cd $(@D) && $(CMAKE) . >/dev/null 2>&1 cd $(@D) && if [ -f Makefile ]; then make; fi .PHONY: build_examples @@ -99,11 +99,11 @@ build_examples: $(steps:%=%/%) %/OK-Debug: - cd $(@D) && cmake -DCMAKE_BUILD_TYPE=Debug . >/dev/null 2>&1 + cd $(@D) && $(CMAKE) -DCMAKE_BUILD_TYPE=Debug . >/dev/null 2>&1 cd $(@D) && if $(RUN_EXAMPLES); then make run; fi && touch OK-Debug %/OK-Release: - cd $(@D) && cmake -DCMAKE_BUILD_TYPE=Release . >/dev/null 2>&1 + cd $(@D) && $(CMAKE) -DCMAKE_BUILD_TYPE=Release . >/dev/null 2>&1 cd $(@D) && if $(RUN_EXAMPLES); then make run; fi && touch OK-Release %/OK: %/OK-Debug %/OK-Release -- 2.39.5