You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@celix.apache.org by ab...@apache.org on 2011/07/27 14:20:54 UTC

svn commit: r1151443 - in /incubator/celix/trunk/cmake: Packaging.cmake run.sh.in

Author: abroekhuis
Date: Wed Jul 27 12:20:53 2011
New Revision: 1151443

URL: http://svn.apache.org/viewvc?rev=1151443&view=rev
Log:
Updated run script creation to use correct library path based on the system (LD vs DYLD etc)

Modified:
    incubator/celix/trunk/cmake/Packaging.cmake
    incubator/celix/trunk/cmake/run.sh.in

Modified: incubator/celix/trunk/cmake/Packaging.cmake
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/Packaging.cmake?rev=1151443&r1=1151442&r2=1151443&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/Packaging.cmake (original)
+++ incubator/celix/trunk/cmake/Packaging.cmake Wed Jul 27 12:20:53 2011
@@ -128,6 +128,15 @@ MACRO(deploy)
 	set(FW_PATH ${CMAKE_BINARY_DIR}/framework)
 	set(UTILS_PATH ${CMAKE_BINARY_DIR}/utils)
 	set(LAUNCHER ${CMAKE_BINARY_DIR}/launcher/launcher)
+	
+	IF(UNIX)
+	  IF(APPLE)
+	    set(LIBRARY_PATH DYLD_LIBRARY_PATH)
+	  ELSE(APPLE)
+	    set(LIBRARY_PATH LD_LIBRARY_PATH)
+	  ENDIF(APPLE)
+	ENDIF(UNIX)
+	
 	CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/run.sh.in ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME}/run.sh @ONLY)
 	
 	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/deploy/${DEPLOY_NAME} DESTINATION . COMPONENT ${DEPLOY_COMPONENT})

Modified: incubator/celix/trunk/cmake/run.sh.in
URL: http://svn.apache.org/viewvc/incubator/celix/trunk/cmake/run.sh.in?rev=1151443&r1=1151442&r2=1151443&view=diff
==============================================================================
--- incubator/celix/trunk/cmake/run.sh.in (original)
+++ incubator/celix/trunk/cmake/run.sh.in Wed Jul 27 12:20:53 2011
@@ -1,2 +1,2 @@
-DYLD_LIBRARY_PATH=@FW_PATH@:@UTILS_PATH@
+@LIBRARY_PATH@=@FW_PATH@:@UTILS_PATH@
 @LAUNCHER@
\ No newline at end of file