From 06ba917c653947c6e767816a0af0bd7e302826c6 Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 7 Nov 2013 11:03:44 +0000 Subject: [PATCH] CMake: Update path variables for current build system --- bin/runAppli.in | 4 ++-- doc/en/conf.py.in | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/runAppli.in b/bin/runAppli.in index 7bd9ac95..8c8d9670 100755 --- a/bin/runAppli.in +++ b/bin/runAppli.in @@ -19,8 +19,8 @@ # export KERNEL_ROOT_DIR=@KERNEL_ROOT_DIR@ -export PYHELLO_ROOT_DIR=@prefix@ +export HOMARD_ROOT_DIR=@CMAKE_INSTALL_PREFIX@ -python -i $PYHELLO_ROOT_DIR/bin/salome/runSalome.py --modules=PYHELLO --xterm --containers=cpp,python --killall +${KERNEL_ROOT_DIR}/bin/salome/envSalome.py python -i ${HOMARD_ROOT_DIR}/bin/salome/runSalome.py --modules=HOMARD --xterm --containers=cpp,python --killall diff --git a/doc/en/conf.py.in b/doc/en/conf.py.in index 0f9920b5..716e760c 100644 --- a/doc/en/conf.py.in +++ b/doc/en/conf.py.in @@ -45,7 +45,7 @@ copyright = u'1996, 2011, 2013, EDF R&D, G. Nicolas, T. Fouquet, P. Noyret' # built documents. # # The short X.Y version. -version = '@SHORT_VERSION@' +version = '@SALOMEHOMARD_VERSION@' # The full version, including alpha/beta/rc tags. release = '@SALOMEHOMARD_VERSION@' -- 2.39.2