[Gearbox-commit] SF.net SVN: gearbox: [138] gearbox/trunk/cmake

[<rus...@us...>]

Revision: 138
          http://gearbox.svn.sourceforge.net/gearbox/?rev=138&view=rev
Author:   russo2503v
Date:     2008-05-07 00:30:38 -0700 (Wed, 07 May 2008)

Log Message:
-----------
fixed warnings with cmake 2.6

Modified Paths:
--------------
    gearbox/trunk/cmake/SetupVersion.cmake
    gearbox/trunk/cmake/TargetUtils.cmake

Modified: gearbox/trunk/cmake/SetupVersion.cmake
===================================================================
--- gearbox/trunk/cmake/SetupVersion.cmake	2008-05-05 00:58:47 UTC (rev 137)
+++ gearbox/trunk/cmake/SetupVersion.cmake	2008-05-07 07:30:38 UTC (rev 138)
@@ -2,8 +2,11 @@
 # define the project version so we can have access to it from the code
 #
 
+if(COMMAND cmake_policy)
+    cmake_policy(SET CMP0005 OLD)
+endif(COMMAND cmake_policy)
+
 # alexm: for gcc need to produce this in the Makefile: -DGEARBOX_VERSION=\"X.Y.Z\", 
 #        without escaping the quotes the compiler will strip them off.
 # alexb: it seems that you also need to escape the quotes for windoze??
-
 ADD_DEFINITIONS( "-DGEARBOX_VERSION=\\\"${GBX_PROJECT_VERSION}\\\"" )

Modified: gearbox/trunk/cmake/TargetUtils.cmake
===================================================================
--- gearbox/trunk/cmake/TargetUtils.cmake	2008-05-05 00:58:47 UTC (rev 137)
+++ gearbox/trunk/cmake/TargetUtils.cmake	2008-05-07 07:30:38 UTC (rev 138)
@@ -4,6 +4,10 @@
 # Usage is the same as ADD_EXECUTABLE, all parameters are passed to ADD_EXECUTABLE.
 #
 MACRO( GBX_ADD_EXECUTABLE name )
+    if(COMMAND cmake_policy)
+      cmake_policy(SET CMP0003 NEW)
+    endif(COMMAND cmake_policy)
+
     ADD_EXECUTABLE( ${name} ${ARGN} )
 #     SET_TARGET_PROPERTIES( ${name} PROPERTIES
 #         INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}"
@@ -22,6 +26,10 @@
 # Usage is the same as ADD_LIBRARY, all parameters are passed to ADD_LIBRARY.
 #
 MACRO( GBX_ADD_LIBRARY name )
+    if(COMMAND cmake_policy)
+      cmake_policy(SET CMP0003 NEW)
+    endif(COMMAND cmake_policy)
+
     ADD_LIBRARY( ${name} ${ARGN} )
 #     SET_TARGET_PROPERTIES( ${name} PROPERTIES
 #         INSTALL_RPATH "${INSTALL_RPATH};${CMAKE_INSTALL_PREFIX}/lib/${PROJECT_NAME}"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.