From: rnv <rnv@opencascade.com>
Date: Wed, 16 Oct 2019 09:10:33 +0000 (+0300)
Subject: Fix for '#17858 Many ctest errors in SHAPER' issue
X-Git-Tag: V9_5_0a1~167^2~43
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8d2a8cb8c4d18a4ff5398a1e8f0cf104eed3c89d;p=modules%2Fshaper.git

Fix for '#17858 Many ctest errors in SHAPER' issue
---

diff --git a/CMakeCommon/FindSalome.cmake b/CMakeCommon/FindSalome.cmake
index 91d2ea820..98c5381ac 100644
--- a/CMakeCommon/FindSalome.cmake
+++ b/CMakeCommon/FindSalome.cmake
@@ -68,5 +68,6 @@ IF(EXISTS ${GUI_ROOT_DIR})
 
 	SET(SALOME_GUI_INCLUDE ${GUI_ROOT_DIR}/include/salome)
 	SET(SALOME_KERNEL_INCLUDE ${KERNEL_ROOT_DIR}/include/salome)
+        SET(SALOME_KERNEL_LIBDIR ${KERNEL_ROOT_DIR}/lib/salome)
 	ADD_DEFINITIONS( -DHAVE_SALOME )
 ENDIF(EXISTS ${GUI_ROOT_DIR})
diff --git a/CMakeCommon/UnitTest.cmake b/CMakeCommon/UnitTest.cmake
index 30a59c0ff..e2e514fc0 100644
--- a/CMakeCommon/UnitTest.cmake
+++ b/CMakeCommon/UnitTest.cmake
@@ -44,14 +44,14 @@ ENABLE_TESTING()
 
 MACRO(ADD_UNIT_TESTS)
   if (WIN32) # different separators and path to libraries variable name
-    SET(_JUSTPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_BIN};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES};${SUIT_LIB_DIR};$ENV{PATH}")
+    SET(_JUSTPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_BIN};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES};${SUIT_LIB_DIR};${SALOME_KERNEL_LIBDIR};$ENV{PATH}")
     STRING(REPLACE "\\" "/" _JUSTPATH "${_JUSTPATH}")
     STRING(REPLACE ";" "\\;" _JUSTPATH "${_JUSTPATH}")
     SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES};${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS};$ENV{PYTHONPATH}")
     STRING(REPLACE "\\" "/" _PYTHONPATH "${_PYTHONPATH}")
     STRING(REPLACE ";" "\\;" _PYTHONPATH "${_PYTHONPATH}")
   else()
-    SET(_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_BIN}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}:${SUIT_LIB_DIR}:$ENV{LD_LIBRARY_PATH}")
+    SET(_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_BIN}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}:${SUIT_LIB_DIR}:${SALOME_KERNEL_LIBDIR}:$ENV{LD_LIBRARY_PATH}")
     SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_SWIG}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_PLUGIN_FILES}:${CMAKE_INSTALL_PREFIX}/${SHAPER_INSTALL_ADDONS}:$ENV{PYTHONPATH}")
   endif()