CMake: Update path and version variables for current build system

diff --git a/doc/conf.py.in b/doc/conf.py.in
index deeecab04d57d16c4469ccdf6b4274d72fd4d777..90618fcc033696d6f8ad2e22d1ee8565efd7be78 100644 (file)
--- a/doc/conf.py.in
+++ b/doc/conf.py.in
@@ -28,7 +28,7 @@ extensions = ['sphinx.ext.autodoc']
 #extensions = ['rst2pdf.pdfbuilder']
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = [os.path.join('@srcdir@','_templates')]
+templates_path = [os.path.join('@CMAKE_CURRENT_SOURCE_DIR@','_templates')]
 
 # The suffix of source filenames.
 source_suffix = '.rst'
@@ -48,9 +48,9 @@ copyright = '2007-2013 CEA/DEN, EDF R&D.'
 # built documents.
 #
 # The short X.Y version.
-version = '@SHORT_VERSION@'
+version = '@SALOMEYACS_VERSION@'
 # The full version, including alpha/beta/rc tags.
-release = '@VERSION@'
+release = '@SALOMEYACS_VERSION@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -113,7 +113,7 @@ html_theme = 'default'
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = [os.path.join('@srcdir@','_static')]
+html_static_path = [os.path.join('@CMAKE_CURRENT_SOURCE_DIR@','_static')]
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.

diff --git a/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in b/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in
index 60837c8620987845f60dc30341ec9ebd62370e09..928567a4c36c144217ae49918f9ebc96c5d31fbc 100755 (executable)
--- a/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in
+++ b/src/yacsloader/Test/YacsLoaderInSessionTest.sh.in
@@ -22,7 +22,7 @@
 
 # --- wait until SALOME containers are ready
 
-python @srcdir@/waitContainers.py
+python @CMAKE_CURRENT_SOURCE_DIR@/waitContainers.py
 
 # --- launch CORBA server echoSrv for tests
 
@@ -31,15 +31,15 @@ pidecho=$!
 echo $pidecho > "/tmp/YACSTEST_PidEcho"
 
 # Environment variables needed for the optimizer loop tests
-export LD_LIBRARY_PATH=@builddir@/.libs:$LD_LIBRARY_PATH
-export PYTHONPATH=@top_builddir@/src/engine_swig:@top_builddir@/src/engine_swig/.libs:$PYTHONPATH
-export PYTHONPATH=@top_builddir@/src/runtime_swig:@top_builddir@/src/runtime_swig/.libs:$PYTHONPATH
-export PYTHONPATH=@srcdir@:$PYTHONPATH
+export LD_LIBRARY_PATH=@CMAKE_CURRENT_BINARY_DIR@/.libs:$LD_LIBRARY_PATH
+export PYTHONPATH=@CMAKE_BINARY_DIR@/src/engine_swig:@CMAKE_BINARY_DIR@/src/engine_swig/.libs:$PYTHONPATH
+export PYTHONPATH=@CMAKE_BINARY_DIR@/src/runtime_swig:@CMAKE_BINARY_DIR@/src/runtime_swig/.libs:$PYTHONPATH
+export PYTHONPATH=@CMAKE_CURRENT_SOURCE_DIR@:$PYTHONPATH
 
 # --- launch unit tests
 
-export ROOT_SAMPLES=@ROOT_SRCDIR@/src/yacsloader/samples
-export TESTCOMPONENT_ROOT_DIR=@top_builddir@/src/runtime/Test
+export ROOT_SAMPLES=@CMAKE_SOURCE_DIR@/src/yacsloader/samples
+export TESTCOMPONENT_ROOT_DIR=@CMAKE_BINARY_DIR@/src/runtime/Test
 
 ./TestYacsLoader
 ret=$?

diff --git a/src/yacsloader/Test/YacsLoaderTest.sh.in b/src/yacsloader/Test/YacsLoaderTest.sh.in
index 12ce9c61a1f54aa177f90977e9b4fca0ee18c271..df5a2f3f2f3dcb544bb751f31c8e092800a32537 100755 (executable)
--- a/src/yacsloader/Test/YacsLoaderTest.sh.in
+++ b/src/yacsloader/Test/YacsLoaderTest.sh.in
@@ -39,7 +39,7 @@ EOF
 
   # --- launch in background a SALOME session (servers)
 
-  ln -fs @top_srcdir@/src/yacsloader/samples .
+  ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples .
   ./runAppli > log1 2>&1
 
   # --- wait a little to let the background process define
@@ -49,8 +49,8 @@ EOF
 
   # --- execute the test script in SALOME session environment
 
-  chmod +x @builddir@/YacsLoaderInSessionTest.sh
-  ./runSession @builddir@/YacsLoaderInSessionTest.sh
+  chmod +x @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
+  ./runSession @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
   ret=$?
 
   # ---------------------------------------------------------------------------
@@ -66,9 +66,9 @@ EOF
 
 else
 
-  ln -fs @top_srcdir@/src/yacsloader/samples .
-  chmod +x @builddir@/YacsLoaderInSessionTest.sh
-  @builddir@/YacsLoaderInSessionTest.sh
+  ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples .
+  chmod +x @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
+  @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
   ret=$?
   echo "exec status YacsLoaderInSessionTest.sh " $ret
 

diff --git a/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in b/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
index 79f67851fc03a3038c990d6351ed264be0657c4b..4c22e2bf0a48b5a403446e53c2f398c87f0c5fdc 100644 (file)
--- a/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
+++ b/src/yacsloader_swig/Test/YacsLoaderInSessionTest.sh.in
@@ -26,54 +26,54 @@
 pidecho=$!
 echo $pidecho > "/tmp/YACSTEST_PidEcho"
 
-python @top_srcdir@/src/yacsloader/Test/waitContainers.py
+python @CMAKE_SOURCE_DIR@/src/yacsloader/Test/waitContainers.py
 
 # --- launch unit tests
 
-export ROOT_SAMPLES=@ROOT_SRCDIR@/src/yacsloader/samples
-export TESTCOMPONENT_ROOT_DIR=@top_builddir@/src/runtime/Test
+export ROOT_SAMPLES=@CMAKE_SOURCE_DIR@/src/yacsloader/samples
+export TESTCOMPONENT_ROOT_DIR=@CMAKE_BINARY_DIR@/src/runtime/Test
 
-export PYTHONPATH=..:../.libs:@top_srcdir@/src/yacsloader_swig:${PYTHONPATH}
-export PYTHONPATH=../../runtime_swig:../../runtime_swig/.libs:@top_srcdir@/src/runtime_swig:${PYTHONPATH}
-export PYTHONPATH=../../engine_swig:../../engine_swig/.libs:@top_srcdir@/src/engine_swig:${PYTHONPATH}
+export PYTHONPATH=..:../.libs:@CMAKE_SOURCE_DIR@/src/yacsloader_swig:${PYTHONPATH}
+export PYTHONPATH=../../runtime_swig:../../runtime_swig/.libs:@CMAKE_SOURCE_DIR@/src/runtime_swig:${PYTHONPATH}
+export PYTHONPATH=../../engine_swig:../../engine_swig/.libs:@CMAKE_SOURCE_DIR@/src/engine_swig:${PYTHONPATH}
 export PYTHONPATH=../../yacsloader/Test:${PYTHONPATH}
 
-python  @srcdir@/testExec.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testExec.py
 ret0=$?
 if [ $ret0 -gt 0 ]; then
   echo "exec status testExec : " $ret0
   exit $ret0
 fi
 
-python  @srcdir@/testResume.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testResume.py
 ret1=$?
 if [ $ret1 -gt 0 ]; then
   echo "exec status testResume : " $ret1
   exit $ret1
 fi
 
-python  @srcdir@/testLoader.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testLoader.py
 ret2=$?
 if [ $ret2 -gt 0 ]; then
   echo "exec status testLoader : " $ret2
   exit $ret2
 fi
 
-python  @srcdir@/testEdit.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testEdit.py
 ret3=$?
 if [ $ret3 -gt 0 ]; then
   echo "exec status testEdit : " $ret3
   exit $ret3
 fi
 
-python  @srcdir@/testSave.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testSave.py
 ret4=$?
 if [ $ret4 -gt 0 ]; then
   echo "exec status testSave : " $ret4
   exit $ret4
 fi
 
-python  @srcdir@/testRefcount.py
+python  @CMAKE_CURRENT_SOURCE_DIR@/testRefcount.py
 ret5=$?
 if [ $ret5 -gt 0 ]; then
   echo "exec status testRefcount : " $ret5

diff --git a/src/yacsloader_swig/Test/YacsLoaderTest.sh.in b/src/yacsloader_swig/Test/YacsLoaderTest.sh.in
index 12ce9c61a1f54aa177f90977e9b4fca0ee18c271..df5a2f3f2f3dcb544bb751f31c8e092800a32537 100755 (executable)
--- a/src/yacsloader_swig/Test/YacsLoaderTest.sh.in
+++ b/src/yacsloader_swig/Test/YacsLoaderTest.sh.in
@@ -39,7 +39,7 @@ EOF
 
   # --- launch in background a SALOME session (servers)
 
-  ln -fs @top_srcdir@/src/yacsloader/samples .
+  ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples .
   ./runAppli > log1 2>&1
 
   # --- wait a little to let the background process define
@@ -49,8 +49,8 @@ EOF
 
   # --- execute the test script in SALOME session environment
 
-  chmod +x @builddir@/YacsLoaderInSessionTest.sh
-  ./runSession @builddir@/YacsLoaderInSessionTest.sh
+  chmod +x @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
+  ./runSession @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
   ret=$?
 
   # ---------------------------------------------------------------------------
@@ -66,9 +66,9 @@ EOF
 
 else
 
-  ln -fs @top_srcdir@/src/yacsloader/samples .
-  chmod +x @builddir@/YacsLoaderInSessionTest.sh
-  @builddir@/YacsLoaderInSessionTest.sh
+  ln -fs @CMAKE_SOURCE_DIR@/src/yacsloader/samples .
+  chmod +x @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
+  @CMAKE_CURRENT_BINARY_DIR@/YacsLoaderInSessionTest.sh
   ret=$?
   echo "exec status YacsLoaderInSessionTest.sh " $ret