Revision: 8267
http://playerstage.svn.sourceforge.net/playerstage/?rev=8267&view=rev
Author: gbiggs
Date: 2009-09-29 01:31:49 +0000 (Tue, 29 Sep 2009)
Log Message:
-----------
Applied patch #2861887: Added checks for non-existent policies.
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-09-27 03:10:35 UTC
(rev 8266)
+++ code/player/trunk/cmake/UsePlayerC++.cmake.in 2009-09-29 01:31:49 UTC
(rev 8267)
@@ -1,7 +1,11 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
IF (COMMAND CMAKE_POLICY)
- CMAKE_POLICY (SET CMP0003 NEW)
- CMAKE_POLICY (SET CMP0011 NEW)
+ IF (POLICY CMP0003)
+ CMAKE_POLICY (SET CMP0003 NEW)
+ ENDIF (POLICY CMP0003)
+ IF (POLICY CMP0011)
+ CMAKE_POLICY (SET CMP0011 NEW)
+ ENDIF (POLICY CMP0011)
ENDIF (COMMAND CMAKE_POLICY)
INCLUDE (PlayerUtils)
@@ -66,6 +70,7 @@
BUILD_WITH_INSTALL_RPATH TRUE)
ENDIF (PLAYERCPP_LIBRARY_DIRS)
IF (_linkFlags)
+ LIST_TO_STRING (_linkFlags "${_linkFlags}")
SET_TARGET_PROPERTIES (${_clientName} PROPERTIES LINK_FLAGS
${_linkFlags})
ENDIF (_linkFlags)
IF (PLAYERCPP_LINK_FLAGS)
Modified: code/player/trunk/cmake/UsePlayerC.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerC.cmake.in 2009-09-27 03:10:35 UTC (rev
8266)
+++ code/player/trunk/cmake/UsePlayerC.cmake.in 2009-09-29 01:31:49 UTC (rev
8267)
@@ -1,7 +1,11 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
IF (COMMAND CMAKE_POLICY)
- CMAKE_POLICY (SET CMP0003 NEW)
- CMAKE_POLICY (SET CMP0011 NEW)
+ IF (POLICY CMP0003)
+ CMAKE_POLICY (SET CMP0003 NEW)
+ ENDIF (POLICY CMP0003)
+ IF (POLICY CMP0011)
+ CMAKE_POLICY (SET CMP0011 NEW)
+ ENDIF (POLICY CMP0011)
ENDIF (COMMAND CMAKE_POLICY)
INCLUDE (PlayerUtils)
@@ -69,6 +73,7 @@
SET_TARGET_PROPERTIES (${_clientName} PROPERTIES LINK_FLAGS
${PLAYERC_LINK_FLAGS})
ENDIF (PLAYERC_LINK_FLAGS)
IF (_linkFlags)
+ LIST_TO_STRING (_linkFlags "${_linkFlags}")
SET_TARGET_PROPERTIES (${_clientName} PROPERTIES LINK_FLAGS
${_linkFlags})
ENDIF (_linkFlags)
IF (_linkLibs)
Modified: code/player/trunk/cmake/UsePlayerPlugin.cmake.in
===================================================================
--- code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-09-27 03:10:35 UTC
(rev 8266)
+++ code/player/trunk/cmake/UsePlayerPlugin.cmake.in 2009-09-29 01:31:49 UTC
(rev 8267)
@@ -1,7 +1,11 @@
CMAKE_MINIMUM_REQUIRED (VERSION 2.4 FATAL_ERROR)
IF (COMMAND CMAKE_POLICY)
- CMAKE_POLICY (SET CMP0003 NEW)
- CMAKE_POLICY (SET CMP0011 NEW)
+ IF (POLICY CMP0003)
+ CMAKE_POLICY (SET CMP0003 NEW)
+ ENDIF (POLICY CMP0003)
+ IF (POLICY CMP0011)
+ CMAKE_POLICY (SET CMP0011 NEW)
+ ENDIF (POLICY CMP0011)
ENDIF (COMMAND CMAKE_POLICY)
INCLUDE (PlayerUtils)
@@ -112,6 +116,7 @@
BUILD_WITH_INSTALL_RPATH TRUE)
ENDIF (PLAYERCORE_LIBRARY_DIRS)
IF (_linkFlags)
+ LIST_TO_STRING (_linkFlags "${_linkFlags}")
SET_TARGET_PROPERTIES (${_driverName} PROPERTIES LINK_FLAGS
${_linkFlags})
ENDIF (_linkFlags)
IF (PLAYERCORE_LINK_FLAGS)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
