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 94bdf2355be80aca48c18376f4f7e8b79f8c5c70 (commit)
via 030b8e8b0570e312ceee40c1ac12367ea8c0835d (commit)
from 7a56d861f71e5d929a48f477657b70c6cad16159 (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=94bdf2355be80aca48c18376f4f7e8b79f8c5c70
commit 94bdf2355be80aca48c18376f4f7e8b79f8c5c70
Merge: 7a56d86 030b8e8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 18 09:55:51 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Mar 18 09:55:51 2016 -0400
Merge topic 'cpack-osx-optional-CoreServices' into next
030b8e8b fixup! CPack: Avoid using OS X CoreServices if compiler fails on
header
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=030b8e8b0570e312ceee40c1ac12367ea8c0835d
commit 030b8e8b0570e312ceee40c1ac12367ea8c0835d
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 18 09:54:36 2016 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 18 09:54: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 eaad702..75c179f 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -722,17 +722,17 @@ if(APPLE)
CPack/cmCPackOSXX11Generator.cxx
CPack/cmCPackPackageMakerGenerator.cxx
)
- check_include_file("CoreServices/CoreServices.h" HAVE_CoreServices)
- if(HAVE_CoreServices)
- set_property(SOURCE CPack/cmCPackDragNDropGenerator.cxx PROPERTY
COMPILE_DEFINITIONS HAVE_CoreServices)
- endif()
endif()
# Build CPackLib
add_library(CPackLib ${CPACK_SRCS})
target_link_libraries(CPackLib CMakeLib)
if(APPLE)
- target_link_libraries(CPackLib "-framework CoreServices")
+ 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")
+ endif()
endif()
if(APPLE)
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeLists.txt | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
