From 463da96a08071ece7e46256f5c579e3a64fbc10e Mon Sep 17 00:00:00 2001 From: Christophe Bourcier Date: Fri, 1 Dec 2017 16:56:00 +0100 Subject: [PATCH] Fix to add KERNEL and GUI libraries to launch salome in the build environment --- src/ConnectorAPI/Test/CMakeLists.txt | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/ConnectorAPI/Test/CMakeLists.txt b/src/ConnectorAPI/Test/CMakeLists.txt index b25990186..1506027b2 100755 --- a/src/ConnectorAPI/Test/CMakeLists.txt +++ b/src/ConnectorAPI/Test/CMakeLists.txt @@ -25,8 +25,18 @@ SET(SALOME_SHAPER_INSTALL_TESTS "${SHAPER_INSTALL_PYTHON_FILES}/test") SET(TEST_INSTALL_DIRECTORY ${SALOME_SHAPER_INSTALL_TESTS}) # make test +SET(SALOME_INSTALL_LIBS "lib/salome") +# Adding KERNEL and GUI libraries to environment so that Salome launches correctly +if (WIN32) + SALOME_ACCUMULATE_ENVIRONMENT(PATH NOCHECK ${KERNEL_ROOT_DIR}/${SALOME_INSTALL_LIBS}) + SALOME_ACCUMULATE_ENVIRONMENT(PATH NOCHECK ${GUI_ROOT_DIR}/${SALOME_INSTALL_LIBS}) +else() + SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${KERNEL_ROOT_DIR}/${SALOME_INSTALL_LIBS}) + SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH NOCHECK ${GUI_ROOT_DIR}/${SALOME_INSTALL_LIBS}) +endif() SALOME_GENERATE_TESTS_ENVIRONMENT(tests_env) + # -B ${CMAKE_SOURCE_DIR}/doc/salome/examples/testme.py FOREACH(tfile ${TEST_NAMES}) SET(TEST_NAME ${COMPONENT_NAME}_${tfile}) -- 2.39.2