[med-svn] [vista] 02/02: Enabled TEST_VISTA_SETUP and simplified build.

[Luis Ibanez]

This is an automated email from the git hooks/post-receive script.

luisibanez-guest pushed a commit to branch master
in repository vista.

commit 8a864595f6274c2b43236025db85f21d74172642
Author: Luis Ibanez <luis.ibanez at kitware.com>
Date:   Mon Jan 27 17:51:32 2014 -0500

    Enabled TEST_VISTA_SETUP and simplified build.
    
    In the build stage we are now simply calling "make", instead of the
    multistage make ExperimentalStart, ExperimentalConfigure, ExperimentalBuild.
---
 debian/rules | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index e0697e3..1494da4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ cmake $(VISTA_TESTING_SOURCE_DIR)   \
 -DGTM_DIST:PATH=$(GTM_INSTALL_DIR) \
 -DGTM_SOURCE_DIR:STRING=$(VISTA_GTM_ROUTINES) \
 -DTEST_VISTA:BOOL=ON \
--DTEST_VISTA_SETUP:BOOL=OFF \
+-DTEST_VISTA_SETUP:BOOL=ON \
 -DTEST_VISTA_FRESH:BOOL=ON \
 -DTEST_VISTA_FRESH_ALL:BOOL=ON \
 -DTEST_VISTA_GTM_ROUTINE_DIR:STRING=$(VISTA_ROUTINES_DIR) \
@@ -99,10 +99,8 @@ cmake $(VISTA_TESTING_SOURCE_DIR)   \
 override_dh_auto_build:
 	(export gtmgbldir=$(VISTA_GTM_DATABASE); export gtmroutines=$(VISTA_GTM_ROUTINES); export gtm_dist=$(GTM_INSTALL_DIR); \
 export gtm_destdir=$(LOCALINSTANCEDIR); \
-cd $(VISTA_TESTING_BINARY_DIR); \
-make ExperimentalStart; \
-make ExperimentalConfigure; \
-make ExperimentalBuild)
+cd $(VISTA_TESTING_BINARY_DIR) && make)
+
 
 
 override_dh_auto_install:

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/vista.git