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 8628ae30966f971b86e10abb729224ee9ad2c307 (commit)
via 46aa15d9146b387191d647814ada108d933203e7 (commit)
from 36e31e35a08e2c63ee13d2919519aaf35def13ec (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8628ae30966f971b86e10abb729224ee9ad2c307
commit 8628ae30966f971b86e10abb729224ee9ad2c307
Merge: 36e31e3 46aa15d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 18 11:13:10 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Mar 18 11:13:10 2016 -0400
Merge topic 'cpack-osx-optional-CoreServices' into next
46aa15d9 fixup! CPack: Avoid using OS X CoreServices if compiler fails on
header
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=46aa15d9146b387191d647814ada108d933203e7
commit 46aa15d9146b387191d647814ada108d933203e7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 18 11:07:09 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 18 11:12:36 2016 -0400
fixup! CPack: Avoid using OS X CoreServices if compiler fails on header
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 75c179f..4ef0e80 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -728,10 +728,19 @@ endif()
add_library(CPackLib ${CPACK_SRCS})
target_link_libraries(CPackLib CMakeLib)
if(APPLE)
+ # Some compilers produce errors in the CoreServices framework headers.
+ # Ideally such errors should be fixed by either the compiler vendor
+ # or the framework source, but we try to workaround it and build anyway.
+ # If it does not work, build with reduced functionality and warn.
check_include_file("CoreServices/CoreServices.h" HAVE_CoreServices)
if(HAVE_CoreServices)
set_property(SOURCE CPack/cmCPackDragNDropGenerator.cxx PROPERTY
COMPILE_DEFINITIONS HAVE_CoreServices)
target_link_libraries(CPackLib "-framework CoreServices")
+ else()
+ message(WARNING "This compiler does not appear to support\n"
+ " #include <CoreServices/CoreServices.h>\n"
+ "Some CPack functionality may be limited.\n"
+ "See CMakeFiles/CMakeError.log for details of the failure.")
endif()
endif()
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 9 +++++++++
1 file changed, 9 insertions(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
