From: guigues <guigues>
Date: Mon, 28 Jul 2008 12:58:21 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.0
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8941c834f2131a049f2b401a58068cdcff7aae53;hp=3b9a7d6bbd5efb1c13ffeceac7e4dabe4da25926;p=bbtk.git

*** empty log message ***
---

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index c2f1709..ecc26f9 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -84,10 +84,11 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
     ${BBTK_BBFY_DEPENDENCY} 
     )
   ELSE(WIN32)
+
  ADD_CUSTOM_COMMAND(
     OUTPUT ${BBFY_CXX_OUT}
     COMMAND
-    ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
+    export LD_LIBRARY_PATH=${LD_LIBRARY_PATH} && ${BBTK_BBFY} ${xmlfile} ${BBTK_PACKAGE_NAME} ${CMAKE_CURRENT_BINARY_DIR}/ -q
     DEPENDS ${xmlfile}
     ${BBTK_BBFY_DEPENDENCY} 
     )
diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index 316dc9d..ee211a3 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -30,6 +30,15 @@ SET (LIBRARY_OUTPUT_PATH
   ${PROJECT_BINARY_DIR}/${LIBRARY_OUTPUT_REL_PATH})
 #-----------------------------------------------------------------------------
 
+
+#-----------------------------------------------------------------------------
+IF(WIN32)
+ELSE(WIN32)
+  SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+ENDIF(WIN32)
+#-----------------------------------------------------------------------------
+
+
 #-----------------------------------------------------------------------------
 # The var BBTK_BIN_PATH
 # gives the system-dependent path to output binaries