diff options
| author | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
|---|---|---|
| committer | Bob Kast <bob.kast@emc.com> | 2018-10-23 09:06:58 -0400 |
| commit | 230d795ae3c3f2e45821b887c6065a81a8c04326 (patch) | |
| tree | 7b014a1547ff1cc9ef80add56eb03b17774a1ff6 /ports/wangle/gflags.patch | |
| parent | 3d1fbeb7de48a3d7a782be7b8722efb5015c7010 (diff) | |
| parent | 9b21ff9612916e24f89c6839599d3d50446597d8 (diff) | |
| download | vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.tar.gz vcpkg-230d795ae3c3f2e45821b887c6065a81a8c04326.zip | |
Merge branch 'master' of https://github.com/EMCECS/vcpkg
# Conflicts:
# ports/ecsutil/CONTROL
# ports/ecsutil/portfile.cmake
Diffstat (limited to 'ports/wangle/gflags.patch')
| -rw-r--r-- | ports/wangle/gflags.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/ports/wangle/gflags.patch b/ports/wangle/gflags.patch new file mode 100644 index 000000000..20921c72c --- /dev/null +++ b/ports/wangle/gflags.patch @@ -0,0 +1,31 @@ +diff --git a/wangle/cmake/FindGflags.cmake b/wangle/cmake/FindGflags.cmake
+index 0243aa3..be3780f 100644
+--- a/wangle/cmake/FindGflags.cmake
++++ b/wangle/cmake/FindGflags.cmake
+@@ -7,19 +7,11 @@
+
+ include(FindPackageHandleStandardArgs)
+
+-find_library(GFLAGS_LIBRARY gflags
+- PATHS ${GFLAGS_LIBRARYDIR})
++find_package(gflags CONFIG REQUIRED)
+
+-find_path(GFLAGS_INCLUDE_DIR gflags/gflags.h
+- PATHS ${GFLAGS_INCLUDEDIR})
+-
+-find_package_handle_standard_args(gflags DEFAULT_MSG
+- GFLAGS_LIBRARY
+- GFLAGS_INCLUDE_DIR)
+-
+-mark_as_advanced(
+- GFLAGS_LIBRARY
+- GFLAGS_INCLUDE_DIR)
+-
+-set(GFLAGS_LIBRARIES ${GFLAGS_LIBRARY})
+-set(GFLAGS_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR})
++if(TARGET gflags_static)
++ set(GFLAGS_LIBRARIES gflags_static)
++else()
++ set(GFLAGS_LIBRARIES gflags_shared)
++endif()
++set(GFLAGS_INCLUDE_DIRS)
|