The-Homebrew-Cloud/cemu-vcpkg
2
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-23 02:57:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update patch

Browse Source
This commit is contained in:
Thad House 2019-04-16 08:03:18 -07:00
parent dd2100ee80
commit b0a7ab2c53
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ports/wpilib/0001-Update-cmake-find-to-support-vcpkg-libuv.patch
View File

@ -1,8 +1,9 @@
From 090e7210fcb8ba91268a21f174a26a66762bbaee Mon Sep 17 00:00:00 2001 From 1cc701c3620b24440fdd7ad95683dca09e575008 Mon Sep 17 00:00:00 2001
From: Thad House <thadhouse1@gmail.com> From: Thad House <thadhouse1@gmail.com>
Date: Sat, 13 Apr 2019 22:04:31 -0700 Date: Sat, 13 Apr 2019 22:04:31 -0700
Subject: [PATCH] Update cmake find to support vcpkg libuv Subject: [PATCH] Update cmake find to support vcpkg libuv
Fix install on MSVC
--- ---
CMakeLists.txt | 34 +++++++++++++++++++---- CMakeLists.txt | 34 +++++++++++++++++++----
cameraserver/CMakeLists.txt | 5 ++-- cameraserver/CMakeLists.txt | 5 ++--
@ -40,7 +41,7 @@ Subject: [PATCH] Update cmake find to support vcpkg libuv
create mode 100644 wpiutil/wpiutil-config.cmake.in create mode 100644 wpiutil/wpiutil-config.cmake.in
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index a5b89d9ac..a8f82f95e 100644 index a5b89d9ac..20557d78e 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -51,6 +51,7 @@ option(WITHOUT_ALLWPILIB "Don't build allwpilib (removes OpenCV requirement)" ON @@ -51,6 +51,7 @@ option(WITHOUT_ALLWPILIB "Don't build allwpilib (removes OpenCV requirement)" ON
@ -66,7 +67,7 @@ index a5b89d9ac..a8f82f95e 100644
+set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)") +set (LIBUV_VCPKG_REPLACE "find_package(unofficial-libuv CONFIG)")
+endif() +endif()
+ +
+if (FLAT_INSTALL_WPILIB) +if (MSVC OR FLAT_INSTALL_WPILIB)
+set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)") +set(WPIUTIL_DEP_REPLACE "include($\{SELF_DIR\}/wpiutil-config.cmake)")
+set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)") +set(NTCORE_DEP_REPLACE "include($\{SELF_DIR\}/ntcore-config.cmake)")
+set(CSCORE_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cscore-config.cmake)") +set(CSCORE_DEP_REPLACE_IMPL "include(\${SELF_DIR}/cscore-config.cmake)")