aboutsummaryrefslogtreecommitdiff
path: root/ports/libui
diff options
context:
space:
mode:
authorVictor Romero <romerosanchezv@gmail.com>2019-02-28 23:53:42 -0800
committerGitHub <noreply@github.com>2019-02-28 23:53:42 -0800
commit8641dfd9dd6d3bf190515822060872a56ee37906 (patch)
tree1334dd5e7c0b2b5eb89452010b730cfbcf25ff85 /ports/libui
parent1afa2b0f7ba4079ff1bb1dd7724733b0cfc583d2 (diff)
downloadvcpkg-8641dfd9dd6d3bf190515822060872a56ee37906.tar.gz
vcpkg-8641dfd9dd6d3bf190515822060872a56ee37906.zip
Modify `vcpkg_fixup_cmake_targets()` (#5459)
* some libraries export <PackageName>LibraryDepends.cmake instead of <PackageName>Targets.cmake. Those file also need the fix of #1044 should close #4753 * prefered the general solution #4622. hopefully solved the issue within #4150 replaced the regex with something more readable (also ident is lost) should close: #4753 #4633 #4150 and maybe more * Hash vcpkg_fixup_cmake_targets.cmake * [boost] Fix use of find_package(Boost) with cache variables [socket-io-client] Fix install * reversed change back to use regex replace * [glbinding] Fix _IMPORT_PREFIX depth in *-export.cmake files * [tinyspline] Ignore warnings treated as errors * [libevent, liblemon, libpng, smpeg2, zlib] Fix apply patches * [libsodium] Fix apply patches * [folly] Link correct libraries in debug and release * [vtk] Remove unset of _IMPORT_PREFIX * [tinyspline] Do not treat warnings as errors * [smpeg2] Fix double* to int comparison * [nvtt] Define value for HAVE_UNISTD_H in MacOS * [libui] Fix MacOS X build * [zlib] Fix download URL * [qhull] Update to v7.2.1 * [podofo] Set value for HAVE_UNISTD_H in MacOS * [mongo-cxx-driver,ogre,podofo,qhull] Bump CONTROL version * [mongo-c-driver] Set _IMPORT_PREFIX * [tmxparser] Bump CONTROL version * [qhull,vxl] Bump CONTROL version
Diffstat (limited to 'ports/libui')
-rw-r--r--ports/libui/001-fix-cmake.patch (renamed from ports/libui/fix-cmake.patch)0
-rw-r--r--ports/libui/002-fix-macosx-build.patch19
-rw-r--r--ports/libui/CONTROL2
-rw-r--r--ports/libui/portfile.cmake3
4 files changed, 22 insertions, 2 deletions
diff --git a/ports/libui/fix-cmake.patch b/ports/libui/001-fix-cmake.patch
index 3d206584b..3d206584b 100644
--- a/ports/libui/fix-cmake.patch
+++ b/ports/libui/001-fix-cmake.patch
diff --git a/ports/libui/002-fix-macosx-build.patch b/ports/libui/002-fix-macosx-build.patch
new file mode 100644
index 000000000..a5b91c7a2
--- /dev/null
+++ b/ports/libui/002-fix-macosx-build.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 50c997f..a23b84d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -16,7 +16,13 @@ cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)
+ # TODO figure out what other variables must be set with CACHE
+ # TODO figure out if FORCE is needed here
+ # TODO figure out whether STRING "" is best or if something else is better; also what FORCE does because I forget and later I say it's needed
+-set(CMAKE_OSX_DEPLOYMENT_TARGET "10.8" CACHE STRING "" FORCE)
++
++# VCPKG PATCH NOTE: Fix build on MacOS
++# Due to a bug in CMake (https://gitlab.kitware.com/cmake/cmake/issues/18396) we change CMAKE_OSX_DEPLOYMENT_TARGET to "10.9".
++# See the discussion here:
++# * https://github.com/andlabs/libui/issues/422
++# * https://github.com/andlabs/libui/issues/457
++set(CMAKE_OSX_DEPLOYMENT_TARGET "10.9" CACHE STRING "" FORCE)
+
+ # we want to disable incremental linking
+ # see also:
diff --git a/ports/libui/CONTROL b/ports/libui/CONTROL
index d1a70f0d5..919f7a12c 100644
--- a/ports/libui/CONTROL
+++ b/ports/libui/CONTROL
@@ -1,3 +1,3 @@
Source: libui
-Version: 2018-11-03
+Version: 2018-11-03-1
Description: Simple and portable (but not inflexible) native GUI library in C.
diff --git a/ports/libui/portfile.cmake b/ports/libui/portfile.cmake
index 4f543a89b..77c2d44df 100644
--- a/ports/libui/portfile.cmake
+++ b/ports/libui/portfile.cmake
@@ -7,7 +7,8 @@ vcpkg_from_github(
SHA512 3a9fb27d0c376479f58ba2fc5be3579efa5f462776a7e725313b92413ce78f3ca60897e63b580c419eeaee2cd2101de2be1ee5af80a547ef433c6284a3053d45
HEAD_REF master
PATCHES
- fix-cmake.patch
+ "001-fix-cmake.patch"
+ "002-fix-macosx-build.patch"
)
vcpkg_configure_cmake(