[Cmake-commits] CMake branch, next, updated. v2.8.3-1085-gfaed439
Clinton Stimpson
clinton at elemtech.com
Thu Dec 23 13:41:55 EST 2010
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via faed4393fb4db017703917521458e34c9f9c9ac6 (commit)
via d640d549d5f7648328f72180966b2a0cd604e29a (commit)
via 97e64e8607dd1f761eaa945c1cc525093725f3fc (commit)
from 3e8bacc4b0aeb2c568b347b4109a8f8320d2ae7e (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=faed4393fb4db017703917521458e34c9f9c9ac6
commit faed4393fb4db017703917521458e34c9f9c9ac6
Merge: 3e8bacc d640d54
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Dec 23 13:41:53 2010 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Dec 23 13:41:53 2010 -0500
Merge topic 'bug-11518-dbus-macro' into next
d640d54 allow absolute paths for dbus interface.
97e64e8 KWSys Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d640d549d5f7648328f72180966b2a0cd604e29a
commit d640d549d5f7648328f72180966b2a0cd604e29a
Author: Clinton Stimpson <clinton at elemtech.com>
AuthorDate: Thu Dec 23 09:21:56 2010 -0700
Commit: Clinton Stimpson <clinton at elemtech.com>
CommitDate: Thu Dec 23 09:21:56 2010 -0700
allow absolute paths for dbus interface.
diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index 6a609a0..86a7404 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -254,7 +254,15 @@ MACRO(QT4_GENERATE_DBUS_INTERFACE _header) # _customName OPTIONS -some -options
GET_FILENAME_COMPONENT(_basename ${_header} NAME_WE)
IF (_customName)
- SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
+ if (IS_ABSOLUTE ${_customName})
+ get_filename_component(_containingDir ${_customName} PATH)
+ if (NOT EXISTS ${_containingDir})
+ file(MAKE_DIRECTORY "${_containingDir}")
+ endif()
+ SET(_target ${_customName})
+ else()
+ SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_customName})
+ endif()
ELSE (_customName)
SET(_target ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.xml)
ENDIF (_customName)
-----------------------------------------------------------------------
Summary of changes:
Modules/Qt4Macros.cmake | 10 +++++++++-
Source/kwsys/kwsysDateStamp.cmake | 2 +-
2 files changed, 10 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list