Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[EDF29322] Revert "[EDF] Taking SALOME launcher options into account through environm...
[modules/kernel.git]
/
CTestTestfileInstall.cmake.in
diff --git
a/CTestTestfileInstall.cmake.in
b/CTestTestfileInstall.cmake.in
index 7532280536b07f612f77d868cc4e5e7d40b73f9b..d3304aa3d23df3a61357d2166c8019ce2cd2e04c 100644
(file)
--- a/
CTestTestfileInstall.cmake.in
+++ b/
CTestTestfileInstall.cmake.in
@@
-1,4
+1,4
@@
-# Copyright (C) 2015-20
17 CEA/DEN, EDF R&D
+# Copyright (C) 2015-20
24 CEA, EDF
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-17,19
+17,23
@@
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
#
-SET(SALOME_TEST_DRIVER "@CMAKE_INSTALL_PREFIX@/bin/salome/appliskel/salome_test_driver.py")
+SET(SALOME_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/salome_test_driver.py")
+SET(PYTHON_TEST_DRIVER "$ENV{KERNEL_ROOT_DIR}/bin/salome/appliskel/python_test_driver.py")
SET(COMPONENT_NAME KERNEL)
SET(TIMEOUT 200)
SET(COMPONENT_NAME KERNEL)
SET(TIMEOUT 200)
-SET(KERNEL_TEST_LIB "
@CMAKE_INSTALL_PREFIX@
/@KERNEL_TEST_LIB@")
+SET(KERNEL_TEST_LIB "
$ENV{KERNEL_ROOT_DIR}
/@KERNEL_TEST_LIB@")
# Add all test subdirs
# Add all test subdirs
-SUBDIRS( Launcher
+SUBDIRS( ArgvKeeper
+ Launcher
+ Launcher_SWIG
LifeCycleCORBA_SWIG
NamingService
SALOMELocalTrace
LifeCycleCORBA
LifeCycleCORBA_SWIG
NamingService
SALOMELocalTrace
LifeCycleCORBA
+ Container
Logger
SALOMETraceCollector
KernelHelpers
Logger
SALOMETraceCollector
KernelHelpers