[Cmake-commits] CMake branch, next, updated. v3.5.0-525-gcfcba93

[Brad King]

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  cfcba931392b24886b41037042353b43f9d46615 (commit)
       via  5d4cbdac8402306dd2d47f0d0681f2e1fe0437f0 (commit)
      from  94bdf2355be80aca48c18376f4f7e8b79f8c5c70 (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=cfcba931392b24886b41037042353b43f9d46615
commit cfcba931392b24886b41037042353b43f9d46615
Merge: 94bdf23 5d4cbda
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 18 09:56:04 2016 -0400
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Mar 18 09:56:04 2016 -0400

    Merge topic 'cpack-osx-optional-CoreServices' into next
    
    5d4cbdac CPack: Avoid using OS X CoreServices if compiler fails on header 
(#16021)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5d4cbdac8402306dd2d47f0d0681f2e1fe0437f0
commit 5d4cbdac8402306dd2d47f0d0681f2e1fe0437f0
Author:     Brad King <brad.k...@kitware.com>
AuthorDate: Fri Mar 18 08:49:02 2016 -0400
Commit:     Brad King <brad.k...@kitware.com>
CommitDate: Fri Mar 18 09:55:00 2016 -0400

    CPack: Avoid using OS X CoreServices if compiler fails on header (#16021)
    
    Some compilers on OS X report errors in the CoreServices framework headers.
    Check for support of the header ahead of time and compile the relevant code
    only when the header is available.

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 5b67a2d..75c179f 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -728,7 +728,11 @@ endif()
 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)
diff --git a/Source/CPack/cmCPackDragNDropGenerator.cxx 
b/Source/CPack/cmCPackDragNDropGenerator.cxx
index 521b395..8009204 100644
--- a/Source/CPack/cmCPackDragNDropGenerator.cxx
+++ b/Source/CPack/cmCPackDragNDropGenerator.cxx
@@ -22,10 +22,12 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
+#ifdef HAVE_CoreServices
 // For the old LocaleStringToLangAndRegionCodes() function, to convert
 // to the old Script Manager RegionCode values needed for the 'LPic' data
 // structure used for generating multi-lingual SLAs.
 #include <CoreServices/CoreServices.h>
+#endif
 
 static const char* SLAHeader =
 "data 'LPic' (5000) {\n"
@@ -643,9 +645,11 @@ int cmCPackDragNDropGenerator::CreateDMG(const 
std::string& src_dir,
                            kCFStringEncodingMacRoman);
         LangCode lang = 0;
         RegionCode region = 0;
+#if HAVE_CoreServices
         OSStatus err = LocaleStringToLangAndRegionCodes(iso_language_cstr,
                                                         &lang, &region);
         if (err != noErr)
+#endif
           {
           cmCPackLogger(cmCPackLog::LOG_ERROR,
             "No language/region code available for " << iso_language_cstr
@@ -653,10 +657,12 @@ int cmCPackDragNDropGenerator::CreateDMG(const 
std::string& src_dir,
           free(iso_language_cstr);
           return 0;
           }
+#if HAVE_CoreServices
         free(iso_language_cstr);
         header_data.push_back(region);
         header_data.push_back(i);
         header_data.push_back(0);
+#endif
         }
       ofs << "data 'LPic' (5000) {\n";
       ofs << std::hex << std::uppercase << std::setfill('0');

-----------------------------------------------------------------------

Summary of changes:


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits