X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FConnectorAPI%2FTest%2FCMakeLists.txt;fp=src%2FConnectorAPI%2FTest%2FCMakeLists.txt;h=1506027b247903987d01443d83f62b2fb1239df3;hb=463da96a08071ece7e46256f5c579e3a64fbc10e;hp=b25990186610d65c4cd896940dde853c3074f788;hpb=ca39fbf06cd192c63b738ebcd9b34c13aa453f81;p=modules%2Fshaper.git

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})