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

diff --git a/src/ConnectorAPI/Test/CMakeLists.txt b/src/ConnectorAPI/Test/CMakeLists.txt
old mode 100755
new mode 100644
index b25990186..127d70a51
--- a/src/ConnectorAPI/Test/CMakeLists.txt
+++ b/src/ConnectorAPI/Test/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2016  CEA/DEN, EDF R&D
+# Copyright (C) 2014-2019  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -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})
@@ -46,4 +56,4 @@ INSTALL(FILES CTestTestfileInstall.cmake
   DESTINATION ${TEST_INSTALL_DIRECTORY}
   RENAME CTestTestfile.cmake)
 
-INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})
\ No newline at end of file
+INSTALL(FILES tests.set DESTINATION ${TEST_INSTALL_DIRECTORY})