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 0fb834147e8a239b1fb928d150bb1e446eee77cb (commit)
via 3189ed34b819de1a67c22ecd446d815ac61649ce (commit)
from 5bdb89199ee19acae434dab2a1f6fd1e38cdd223 (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=0fb834147e8a239b1fb928d150bb1e446eee77cb
commit 0fb834147e8a239b1fb928d150bb1e446eee77cb
Merge: 5bdb891 3189ed3
Author: Brad King <[email protected]>
AuthorDate: Mon Dec 2 09:38:03 2013 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Mon Dec 2 09:38:03 2013 -0500
Merge topic 'osx-cross-compile-fixup' into next
3189ed3 OS X: Fix app bundle search path during cross compiling (#14603)
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3189ed34b819de1a67c22ecd446d815ac61649ce
commit 3189ed34b819de1a67c22ecd446d815ac61649ce
Author: Flynn Marquardt <[email protected]>
AuthorDate: Mon Dec 2 09:32:40 2013 -0500
Commit: Brad King <[email protected]>
CommitDate: Mon Dec 2 09:32:40 2013 -0500
OS X: Fix app bundle search path during cross compiling (#14603)
In "Modules/Platform/Darwin.cmake" the variable _apps_paths stays empty
if cross compiling. Do not de-duplicate an empty list.
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
index f3ec441..fc3f87e 100644
--- a/Modules/Platform/Darwin.cmake
+++ b/Modules/Platform/Darwin.cmake
@@ -341,7 +341,9 @@ foreach(_path
list(APPEND _apps_paths "${_apps}")
endif()
endforeach()
-list(REMOVE_DUPLICATES _apps_paths)
+if(_apps_paths)
+ list(REMOVE_DUPLICATES _apps_paths)
+endif()
set(CMAKE_SYSTEM_APPBUNDLE_PATH
${_apps_paths})
unset(_apps_paths)
-----------------------------------------------------------------------
Summary of changes:
Modules/Platform/Darwin.cmake | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
