]> Creatis software - bbtk.git/commitdiff
*** empty log message *** r0.6.0
authorguigues <guigues>
Mon, 28 Jul 2008 12:58:21 +0000 (12:58 +0000)
committerguigues <guigues>
Mon, 28 Jul 2008 12:58:21 +0000 (12:58 +0000)
kernel/cmake/BBTKConfigurePackage_src.cmake
kernel/cmake/BBTKKernelConfig.cmake

index c2f17095c91413327aeb01fff0c5644adce5e8f5..ecc26f9818ac88976962b3536fd33d2fefeae96d 100644 (file)
@@ -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} 
     )
index 316dc9dda9b1e389cedf1968ba26631c2cfff09d..ee211a3986f8edb5d90528dfedde94b5b738b105 100644 (file)
@@ -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