diff options
| author | Sam Bingner <sam@bingner.com> | 2019-05-08 14:23:47 -1000 |
|---|---|---|
| committer | Sam Bingner <sam@bingner.com> | 2019-05-08 14:23:47 -1000 |
| commit | f8c9a51e12a39036aa22217f6cf65c16d686e23b (patch) | |
| tree | 9183be0fb3452e378e544651e1b2f578e9980b95 | |
| parent | 0bbd60daa93c408aafcfb84c769528c9c4edfed3 (diff) | |
Updates for cmake
| -rw-r--r-- | data/cmake/link-CoreServices.diff | 27 | ||||
| -rw-r--r-- | data/cmake/locale.diff | 27 | ||||
| -rw-r--r-- | data/cmake/make.sh | 4 |
3 files changed, 29 insertions, 29 deletions
diff --git a/data/cmake/link-CoreServices.diff b/data/cmake/link-CoreServices.diff deleted file mode 100644 index e10210aa9..000000000 --- a/data/cmake/link-CoreServices.diff +++ /dev/null @@ -1,27 +0,0 @@ ---- cmake-3.14.2/Source/CMakeLists.txt 2019-04-12 12:10:08.000000000 +0000 -+++ cmake-3.14.2+iPhone/Source/CMakeLists.txt 2019-04-17 21:24:00.563851766 +0000 -@@ -822,7 +822,9 @@ - # On Apple we need CoreFoundation and CoreServices - if(APPLE) - target_link_libraries(CMakeLib "-framework CoreFoundation") -- target_link_libraries(CMakeLib "-framework CoreServices") -+ if(HAVE_CoreServices) -+ target_link_libraries(CMakeLib "-framework CoreServices") -+ endif() - endif() - - if(WIN32 AND NOT UNIX) -diff -ur cmake-3.14.2/Utilities/cmlibarchive/CMakeLists.txt cmake-3.14.2+iPhone/Utilities/cmlibarchive/CMakeLists.txt ---- cmake-3.14.2/Utilities/cmlibarchive/CMakeLists.txt 2019-04-12 12:10:10.000000000 +0000 -+++ cmake-3.14.2+iPhone/Utilities/cmlibarchive/CMakeLists.txt 2019-04-17 21:45:09.028530057 +0000 -@@ -1664,7 +1664,9 @@ - - # We need CoreServices on Mac OS. - IF(APPLE) -- LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") -+ if(HAVE_CoreServices) -+ LIST(APPEND ADDITIONAL_LIBS "-framework CoreServices") -+ endif() - ENDIF(APPLE) - - add_subdirectory(libarchive) diff --git a/data/cmake/locale.diff b/data/cmake/locale.diff new file mode 100644 index 000000000..161b61df8 --- /dev/null +++ b/data/cmake/locale.diff @@ -0,0 +1,27 @@ +diff -ur cmake-3.14.2/Source/CPack/cmCPackDragNDropGenerator.cxx cmake-3.14.2+iPhone/Source/CPack/cmCPackDragNDropGenerator.cxx +--- cmake-3.14.2/Source/CPack/cmCPackDragNDropGenerator.cxx 2019-04-12 02:10:08.000000000 -1000 ++++ cmake-3.14.2+iPhone/Source/CPack/cmCPackDragNDropGenerator.cxx 2019-05-08 11:42:41.000000000 -1000 +@@ -22,6 +22,7 @@ + // to the old Script Manager RegionCode values needed for the 'LPic' data + // structure used for generating multi-lingual SLAs. + # include <CoreServices/CoreServices.h> ++# include <CoreFoundation/CFPriv.h> + #endif + + static const char* SLAHeader = +@@ -575,10 +576,12 @@ + kCFStringEncodingMacRoman); + LangCode lang = 0; + RegionCode region = 0; ++ ScriptCode script = 0; ++ CFStringEncoding encoding = 0; + #ifdef HAVE_CoreServices +- OSStatus err = +- LocaleStringToLangAndRegionCodes(iso_language_cstr, &lang, ®ion); +- if (err != noErr) ++ Boolean ok = ++ CFLocaleGetLanguageRegionEncodingForLocaleIdentifier(iso_language, &lang, ®ion, &script, &encoding); ++ if (!ok) + #endif + { + cmCPackLogger(cmCPackLog::LOG_ERROR, diff --git a/data/cmake/make.sh b/data/cmake/make.sh index 263be1933..92279fea3 100644 --- a/data/cmake/make.sh +++ b/data/cmake/make.sh @@ -22,6 +22,6 @@ set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG ") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG ") EOF -cmake -j4 -DCMAKE_BUILD_TYPE=Release -DCMAKE_Fortran_COMPILER:FILEPATH=FALSE -DCMAKE_TOOLCHAIN_FILE=iphoneos_toolchain.cmake -DCMAKE_LOCALSTATEDIR="/private/var" -DCMAKE_INSTALL_NAME_DIR="/usr/lib" -DCMAKE_INSTALL_RPATH="/usr/" -DCMAKE_OSX_SYSROOT="${PKG_ROOT}" -DCMAKE_INSTALL_PREFIX="/usr/" -DKWSYS_LFS_WORKS=FALSE .. -make -j4 +cmake -j16 -DCMAKE_BUILD_TYPE=Release -DCMAKE_Fortran_COMPILER:FILEPATH=FALSE -DCMAKE_TOOLCHAIN_FILE=iphoneos_toolchain.cmake -DCMAKE_LOCALSTATEDIR="/private/var" -DCMAKE_INSTALL_NAME_DIR="/usr/lib" -DCMAKE_INSTALL_RPATH="/usr/" -DCMAKE_OSX_SYSROOT="${PKG_ROOT}" -DCMAKE_INSTALL_PREFIX="/usr/" -DKWSYS_LFS_WORKS=FALSE .. +make -j16 pkg:install |