diff options
| author | Memphiz <memphis@machzwo.de> | 2016-09-23 11:05:32 +0200 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2016-09-23 11:05:32 +0200 |
| commit | 43aec8bc6d66cffd62236f4931cda371ac45ef1d (patch) | |
| tree | 6bd513d65d2ce1c8ab04bbcb8989242bc783208b /tools | |
| parent | 4b66a4d97487557bacf8f0e0f44cd4ab4c0fb70f (diff) | |
[depends/cmake-native] - bump native cmake to 3.6.2
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/native/cmake-native/Makefile | 3 | ||||
| -rw-r--r-- | tools/depends/native/cmake-native/darwin_enable_tbd_support.patch | 14 |
2 files changed, 1 insertions, 16 deletions
diff --git a/tools/depends/native/cmake-native/Makefile b/tools/depends/native/cmake-native/Makefile index b9991931be..a4788316a7 100644 --- a/tools/depends/native/cmake-native/Makefile +++ b/tools/depends/native/cmake-native/Makefile @@ -3,7 +3,7 @@ PLATFORM=$(NATIVEPLATFORM) DEPS= ../../Makefile.include.in Makefile APPNAME=cmake -VERSION=3.3.2 +VERSION=3.6.2 SOURCE=$(APPNAME)-$(VERSION) ARCHIVE=$(SOURCE).tar.gz @@ -30,7 +30,6 @@ $(TARBALLS_LOCATION)/$(ARCHIVE): $(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS) -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE) - cd $(PLATFORM); patch -p1 < ../darwin_enable_tbd_support.patch cd $(PLATFORM); $(SETENV) $(CONFIGURE) $(APP): $(PLATFORM) diff --git a/tools/depends/native/cmake-native/darwin_enable_tbd_support.patch b/tools/depends/native/cmake-native/darwin_enable_tbd_support.patch deleted file mode 100644 index 031b5def8e..0000000000 --- a/tools/depends/native/cmake-native/darwin_enable_tbd_support.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake -index 4e4810a..bb085ac 100644 (file) ---- a/Modules/Platform/Darwin.cmake -+++ b/Modules/Platform/Darwin.cmake -@@ -53,7 +53,7 @@ set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-dynamiclib -Wl,-headerpad_max_install_ - set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names") - set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,") - set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,") --set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a") -+set(CMAKE_FIND_LIBRARY_SUFFIXES ".tbd" ".dylib" ".so" ".a") - - # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree - # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache - |