Salome HOME
projects
/
modules
/
smesh.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
42838fe
)
CMake: Update path and version variables for current build system
author
mpa
<mpa@opencascade.com>
Thu, 7 Nov 2013 11:30:33 +0000
(11:30 +0000)
committer
mpa
<mpa@opencascade.com>
Thu, 7 Nov 2013 11:30:33 +0000
(11:30 +0000)
doc/docutils/conf.py.in
patch
|
blob
|
history
doc/salome/tui/doxyfile.in
patch
|
blob
|
history
src/Tools/padder/spadderpy/plugin/envPlugins.sh.in
patch
|
blob
|
history
src/Tools/padder/unittests/autotest.sh.in
patch
|
blob
|
history
diff --git
a/doc/docutils/conf.py.in
b/doc/docutils/conf.py.in
index de04a7833a65eb3e14ecb4a3d0417581efb9fdf2..6f929932f3f5d21fe4051ae2fd01d59f141c733f 100644
(file)
--- a/
doc/docutils/conf.py.in
+++ b/
doc/docutils/conf.py.in
@@
-184,7
+184,7
@@
latex_documents = [
# The name of an image file (relative to this directory) to place at the top of
# the title page.
# The name of an image file (relative to this directory) to place at the top of
# the title page.
-latex_logo = '@
srcdir
@/../salome/tui/images/head.png'
+latex_logo = '@
CMAKE_CURRENT_SOURCE_DIR
@/../salome/tui/images/head.png'
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
# For "manual" documents, if this is true, then toplevel headings are parts,
# not chapters.
diff --git
a/doc/salome/tui/doxyfile.in
b/doc/salome/tui/doxyfile.in
index d84fe755f033f1db091fe8969cc3ecf5a377d424..7379feaf1a6461dab14b00f2e43423be46a84f91 100755
(executable)
--- a/
doc/salome/tui/doxyfile.in
+++ b/
doc/salome/tui/doxyfile.in
@@
-109,7
+109,7
@@
EXCLUDE_PATTERNS =
EXAMPLE_PATH =
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
EXAMPLE_PATH =
EXAMPLE_PATTERNS =
EXAMPLE_RECURSIVE = NO
-IMAGE_PATH = @
srcdir
@/images
+IMAGE_PATH = @
CMAKE_CURRENT_SOURCE_DIR
@/images
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = YES
INPUT_FILTER =
FILTER_PATTERNS =
FILTER_SOURCE_FILES = YES
diff --git
a/src/Tools/padder/spadderpy/plugin/envPlugins.sh.in
b/src/Tools/padder/spadderpy/plugin/envPlugins.sh.in
index a03275d5d5f24459f416d7e58d6120227daafba0..8f68aa70361bb00f9c90451b30c51a0a21558577 100644
(file)
--- a/
src/Tools/padder/spadderpy/plugin/envPlugins.sh.in
+++ b/
src/Tools/padder/spadderpy/plugin/envPlugins.sh.in
@@
-17,6
+17,6
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-SPADDER_PLUGINS_PATH=@
prefix
@/plugins
+SPADDER_PLUGINS_PATH=@
CMAKE_INSTALL_PREFIX
@/plugins
export SALOME_PLUGINS_PATH=$SALOME_PLUGINS_PATH:$SPADDER_PLUGINS_PATH
export SALOME_PLUGINS_PATH=$SALOME_PLUGINS_PATH:$SPADDER_PLUGINS_PATH
diff --git
a/src/Tools/padder/unittests/autotest.sh.in
b/src/Tools/padder/unittests/autotest.sh.in
index d882d7d12c9413d1cd95807748c806154c859889..19ed5fee4bdf4c9828b35c8084aa5ed50fd8b1cf 100644
(file)
--- a/
src/Tools/padder/unittests/autotest.sh.in
+++ b/
src/Tools/padder/unittests/autotest.sh.in
@@
-33,7
+33,7
@@
listfiles="\
unittests/usecase_meshJobManager.py \
gui/inputdata.py"
unittests/usecase_meshJobManager.py \
gui/inputdata.py"
-INSTALL_DIR=@
prefix
@
+INSTALL_DIR=@
CMAKE_INSTALL_PREFIX
@
PYTHON_DIR=$INSTALL_DIR/lib/python@PYTHON_VERSION@/site-packages/salome
PYTHONPATH=$PYTHON_DIR:$PYTHONPATH
export PYTHONPATH
PYTHON_DIR=$INSTALL_DIR/lib/python@PYTHON_VERSION@/site-packages/salome
PYTHONPATH=$PYTHON_DIR:$PYTHONPATH
export PYTHONPATH