Revision: 8109
http://playerstage.svn.sourceforge.net/playerstage/?rev=8109&view=rev
Author: gbiggs
Date: 2009-07-23 23:04:32 +0000 (Thu, 23 Jul 2009)
Log Message:
-----------
Fixed bug #2826061
Modified Paths:
--------------
code/player/trunk/cmake/UsePlayerC++.cmake.in
code/player/trunk/cmake/UsePlayerC.cmake.in
code/player/trunk/cmake/UsePlayerPlugin.cmake.in
Modified: code/player/trunk/cmake/UsePlayerC++.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerC++.cmake.in 2009-07-23 23:03:37 UTC
(rev 8108)
+++ code/player/trunk/cmake/UsePlayerC++.cmake.in 2009-07-23 23:04:32 UTC
(rev 8109)
@@ -60,9 +60,11 @@
ENDIF (_libDirs OR PLAYERCPP_LIBRARY_DIRS)
ADD_EXECUTABLE (${_clientName} ${_srcs})
- SET_TARGET_PROPERTIES (${_clientName} PROPERTIES
- INSTALL_RPATH ${PLAYERCPP_LIBRARY_DIRS}
- BUILD_WITH_INSTALL_RPATH TRUE)
+ IF (PLAYERCPP_LIBRARY_DIRS)
+ SET_TARGET_PROPERTIES (${_clientName} PROPERTIES
+ INSTALL_RPATH ${PLAYERCPP_LIBRARY_DIRS}
+ BUILD_WITH_INSTALL_RPATH TRUE)
+ ENDIF (PLAYERCPP_LIBRARY_DIRS)
IF (_linkFlags)
SET_TARGET_PROPERTIES (${_clientName} PROPERTIES LINK_FLAGS
${_linkFlags})
ENDIF (_linkFlags)
Modified: code/player/trunk/cmake/UsePlayerC.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerC.cmake.in 2009-07-23 23:03:37 UTC (rev
8108)
+++ code/player/trunk/cmake/UsePlayerC.cmake.in 2009-07-23 23:04:32 UTC (rev
8109)
@@ -60,9 +60,11 @@
ENDIF (_libDirs OR PLAYERC_LIBRARY_DIRS)
ADD_EXECUTABLE (${_clientName} ${_srcs})
- SET_TARGET_PROPERTIES (${_clientName} PROPERTIES
- INSTALL_RPATH ${PLAYERC_LIBRARY_DIRS}
- BUILD_WITH_INSTALL_RPATH TRUE)
+ IF (PLAYERC_LIBRARY_DIRS)
+ SET_TARGET_PROPERTIES (${_clientName} PROPERTIES
+ INSTALL_RPATH ${PLAYERC_LIBRARY_DIRS}
+ BUILD_WITH_INSTALL_RPATH TRUE)
+ ENDIF (PLAYERC_LIBRARY_DIRS)
IF (PLAYERC_LINK_FLAGS)
SET_TARGET_PROPERTIES (${_clientName} PROPERTIES LINK_FLAGS
${PLAYERC_LINK_FLAGS})
ENDIF (PLAYERC_LINK_FLAGS)
Modified: code/player/trunk/cmake/UsePlayerPlugin.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-07-23 23:03:37 UTC
(rev 8108)
+++ code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-07-23 23:04:32 UTC
(rev 8109)
@@ -106,9 +106,11 @@
ENDIF (_libDirs OR PLAYERCORE_LIBRARY_DIRS)
ADD_LIBRARY (${_driverName} SHARED ${_srcs})
- SET_TARGET_PROPERTIES (${_driverName} PROPERTIES
- INSTALL_RPATH ${PLAYERCORE_LIBRARY_DIRS}
- BUILD_WITH_INSTALL_RPATH TRUE)
+ IF (PLAYERCORE_LIBRARY_DIRS)
+ SET_TARGET_PROPERTIES (${_driverName} PROPERTIES
+ INSTALL_RPATH ${PLAYERCORE_LIBRARY_DIRS}
+ BUILD_WITH_INSTALL_RPATH TRUE)
+ ENDIF (PLAYERCORE_LIBRARY_DIRS)
IF (_linkFlags)
SET_TARGET_PROPERTIES (${_driverName} PROPERTIES LINK_FLAGS
${_linkFlags})
ENDIF (_linkFlags)
@@ -192,9 +194,11 @@
ENDIF (PLUGIN_PLAYERC_CFLAGS)
ADD_LIBRARY (${_interfName} SHARED ${interface_h} ${functiontable_c}
${xdr_h} ${xdr_c} ${_srcs})
- SET_TARGET_PROPERTIES (${_interfName} PROPERTIES
- INSTALL_RPATH ${PLUGIN_PLAYERC_LIBRARY_DIRS}
- BUILD_WITH_INSTALL_RPATH TRUE)
+ IF (PLUGIN_PLAYERC_LIBRARY_DIRS)
+ SET_TARGET_PROPERTIES (${_interfName} PROPERTIES
+ INSTALL_RPATH ${PLUGIN_PLAYERC_LIBRARY_DIRS}
+ BUILD_WITH_INSTALL_RPATH TRUE)
+ ENDIF (PLUGIN_PLAYERC_LIBRARY_DIRS)
IF (_linkFlags)
SET_TARGET_PROPERTIES (${_interfName} PROPERTIES LINK_FLAGS
${_linkFlags})
ENDIF (_linkFlags)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
