From 7f8cbff034fc48e2d19cf56300f77cffc8094720 Mon Sep 17 00:00:00 2001 From: mpa Date: Thu, 7 Nov 2013 11:30:33 +0000 Subject: [PATCH] CMake: Update path and version variables for current build system --- doc/docutils/conf.py.in | 2 +- doc/salome/tui/doxyfile.in | 2 +- src/Tools/padder/spadderpy/plugin/envPlugins.sh.in | 2 +- src/Tools/padder/unittests/autotest.sh.in | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/docutils/conf.py.in b/doc/docutils/conf.py.in index de04a7833..6f929932f 100644 --- 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. -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. diff --git a/doc/salome/tui/doxyfile.in b/doc/salome/tui/doxyfile.in index d84fe755f..7379feaf1 100755 --- 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 -IMAGE_PATH = @srcdir@/images +IMAGE_PATH = @CMAKE_CURRENT_SOURCE_DIR@/images 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 a03275d5d..8f68aa703 100644 --- 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 # -SPADDER_PLUGINS_PATH=@prefix@/plugins +SPADDER_PLUGINS_PATH=@CMAKE_INSTALL_PREFIX@/plugins 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 d882d7d12..19ed5fee4 100644 --- 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" -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 -- 2.39.2