From: guigues <guigues>
Date: Tue, 29 Jul 2008 10:09:46 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: r0.6.2~3
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=47bf7b6f1893730f956ccbdc685794b3eb7fc088;p=bbtk.git

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

diff --git a/kernel/cmake/BBTKConfigurePackage_src.cmake b/kernel/cmake/BBTKConfigurePackage_src.cmake
index 371b645..a20651c 100644
--- a/kernel/cmake/BBTKConfigurePackage_src.cmake
+++ b/kernel/cmake/BBTKConfigurePackage_src.cmake
@@ -84,7 +84,7 @@ FOREACH(xmlfile ${${BBTK_PACKAGE_NAME}_XML_SOURCES})
     ${BBTK_BBFY_DEPENDENCY} 
     )
   ELSE(WIN32)
-
+    SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
     ADD_CUSTOM_COMMAND(
       OUTPUT ${BBFY_CXX_OUT}
       COMMAND
diff --git a/kernel/cmake/BBTKCreatePackageBBdoc.cmake b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
index f2d9713..90266ac 100644
--- a/kernel/cmake/BBTKCreatePackageBBdoc.cmake
+++ b/kernel/cmake/BBTKCreatePackageBBdoc.cmake
@@ -50,6 +50,7 @@ MACRO(BBTK_CREATE_PACKAGE_BBDOC PACKAGE_NAME)
       DEPENDS bb${PACKAGE_NAME} 
       )
   ELSE(WIN32)
+    SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
     ADD_CUSTOM_COMMAND(
       OUTPUT ${DOC_OUTPUT}
       COMMAND 
diff --git a/kernel/cmake/BBTKKernelConfig.cmake b/kernel/cmake/BBTKKernelConfig.cmake
index ee211a3..912c120 100644
--- a/kernel/cmake/BBTKKernelConfig.cmake
+++ b/kernel/cmake/BBTKKernelConfig.cmake
@@ -31,12 +31,6 @@ SET (LIBRARY_OUTPUT_PATH
 #-----------------------------------------------------------------------------
 
 
-#-----------------------------------------------------------------------------
-IF(WIN32)
-ELSE(WIN32)
-  SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
-ENDIF(WIN32)
-#-----------------------------------------------------------------------------
 
 
 #-----------------------------------------------------------------------------
diff --git a/kernel/doc/bbtkWebSite/CMakeLists.txt b/kernel/doc/bbtkWebSite/CMakeLists.txt
index 7a66fe7..ca5ff47 100644
--- a/kernel/doc/bbtkWebSite/CMakeLists.txt
+++ b/kernel/doc/bbtkWebSite/CMakeLists.txt
@@ -43,6 +43,8 @@ IF (WIN32)
     DEPENDS ${BBTK_BBI_DEPENDENCY} ${BBTK_PACKAGES_DEPS}
   )
 ELSE (WIN32)
+   SET(LD_LIBRARY_PATH "$ENV{LD_LIBRARY_PATH}:${LIBRARY_OUTPUT_PATH}")
+#   MESSAGE(LD_LIBRARY_PATH=${LD_LIBRARY_PATH})
   ADD_CUSTOM_COMMAND(
     OUTPUT ${INDEX_OUTPUT}
     COMMAND 
diff --git a/samples/README.txt b/samples/README.txt
index 89fb003..b8a98cb 100644
--- a/samples/README.txt
+++ b/samples/README.txt
@@ -1,6 +1,7 @@
 Using bbtk in C++ 
 ==================
 
-The examples in subdirs must be built as separate projects 
-(it illustrates how bbtk and packages installs are found and used 
-by external projects)
+The examples in subdirs show how to use black boxes in C++.
+This directory must be built as a separate project after bbtk has been built 
+and installed (it illustrates how bbtk and packages installs are found 
+and used by external projects)