3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-29 03:34:26 +08:00
Code Issues Projects Releases Wiki Activity

patch missing @ in cmake config

Browse Source
This commit is contained in:
Phil Christensen 2018-11-30 16:01:31 -08:00
parent 2060eefa86
commit 8b46548826
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/gflags/CONTROL
View File

@ -1,3 +1,3 @@
Source: gflags Source: gflags
Version: 2.2.2 Version: 2.2.2-1
Description: A C++ library that implements commandline flags processing Description: A C++ library that implements commandline flags processing

13
ports/gflags/fix_cmake_config.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/cmake/config.cmake.in b/cmake/config.cmake.in
index a512c2a..e7f50d0 100644
--- a/cmake/config.cmake.in
+++ b/cmake/config.cmake.in
@@ -78,7 +78,7 @@ if (NOT DEFINED @PACKAGE_PREFIX@_NOTHREADS)
else ()
set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
endif ()
- elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
+ elseif (TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_static OR TARGET ${@PACKAGE_PREFIX@_TARGET_PREFIX}@PACKAGE_NAME@_shared)
set (@PACKAGE_PREFIX@_NOTHREADS FALSE)
else ()
set (@PACKAGE_PREFIX@_NOTHREADS TRUE)

7
ports/gflags/portfile.cmake
View File

@ -10,12 +10,9 @@ vcpkg_from_github(
REF v2.2.2 REF v2.2.2
SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447 SHA512 98c4703aab24e81fe551f7831ab797fb73d0f7dfc516addb34b9ff6d0914e5fd398207889b1ae555bac039537b1d4677067dae403b64903577078d99c1bdb447
HEAD_REF master HEAD_REF master
)
vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES PATCHES
${CMAKE_CURRENT_LIST_DIR}/0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root 0001-patch-dir.patch # gflags was estimating a wrong relative path between the gflags-config.cmake file and the include path; "../.." goes from share/gflags/ to the triplet root
fix_cmake_config.patch
) )
vcpkg_configure_cmake( vcpkg_configure_cmake(