vcpkg/ports/glog/fix_glog_CMAKE_MODULE_PATH.patch
yuehua.jia 6f706ab611
[glog] update to v0.5 (#22135)
* [abseil] Upgrade to 2021.1102

* revert portfile.cmake

* update version

* update portfile.cmake

* update version

* [s2geometry] google s2 for for manipulating geometric shapes

* [libevent] no absolute paths (#21179)

* [Pcre2] Check if files exists before call vcpkg_replace_string. (#22003)

* Check if files exists before call vcpkg_replace_string.

* Update per comments.

Only guard debug.

* Update ports/pcre2/portfile.cmake

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* Bump port-version.

Co-authored-by: GLUD Lars <lars.glud@leica-geosystems.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [lodepng] Fix cannot open include file "lodepng.h" (#22007)

* [lodepng] Fix cannot open include file "lodepng.h"

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>

* [MyGUI] update to 3.4.1 (#22015)

* [MyGUI] update to 3.4.1

* update version

* [s2n] Update, add openssl dependency (#21484)

* Update to 1.3.0, add openssl dependency

* Add 'tests' feature

* Update versions

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* Libpq update and VCPKG_OSX_SYSROOT fix (#21583)

* [libpq] Update to 12.9

* [libpq] Use VCPKG_OSX_SYSROOT if set

otherwise configure set the default sysroot in addition, ignoring the
sysroot set by vcpkg_configure_cmake.

* [libpq] remove comment only chunks from patches

* [libpq] update version registry

* [qhttpengine] New port (#22009)

* [qhttpengine] New port

* Update version database

* Fix the format of portfile.cmake

* Fix the format of portfile.cmake

* update version

* Remove duplicate build_shared_libs setting.

Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [ xtensor-io ] Fix wrong hash (#22018)

* [xtensor-io] Fix wrong hash

* update version

* [vcpkg] Update VMs for December 2021 Patch Tuesday (#22013)

* Add Microsoft.VisualStudio.ComponentGroup.UWP.VC.BuildTools to VS as requested by https://github.com/microsoft/vcpkg/issues/19554

* Cherry pick python changes from https://github.com/microsoft/vcpkg/pull/21912

* Update linux pool.

* Update windows pool.

* [starlink] Veggiesaurus/starlink ast cminpack fix (#20559)

* add CMINPACK_NO_DLL flag back

* bump port version

* updated versions JSON

* quotation mark adjustment

* git-tree update

* adjusted c flags configuration

* hash update

* whitespace fix

* git-tree hash update

* updated to ast 9.2.5, added external-cminpack flag

* updated version hash

* removed old version entry

* removed $schema element from json

* updated port git-tree hash

* [libunifex] Update to 2021-12-07 (#21995)

* updated libunifex version

* remove comment

* run x-add-versions --all

* Update ports/libunifex/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* rerun x-add-version libunifex

* Update versions/l-/libunifex.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* update libunifex to 12-07

* x-add-version

* libunifex port update

force cpp20 as cpp17 build doesn't work with msvc. added a compile fix for externConstexpr and removed warnings with /EHsc

* Update libunifex.json

version update

* Update fix-compile-error.patch

relax clang warnings

* Update libunifex.json

git x-add-version libunifex

* remove unused

* x-add-versions

* remove old version log

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [tensorflow] update to 2.7, including bazel latest 4.x update (#22022)

* Revert "incorporate changes from microsoft:master"

* Revert "Revert "incorporate changes from microsoft:master""

* update tensorflow to 2.7 and bazel to latest 4.x

* Update version database.

Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [hiredis] Fix static build (#22038)

* [hiredis] Fix static build

* Update version database

* [vcpkg baseline] Fix mpg123 build failed on Linux (#22028)

* [baseline] Fix mpg123 build failed on Linux

* update version

* Fix misspelled "module".

* Actually fix the misspelling this time Bill.

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [qt5-base] no _debug lib suffixes on macOS (#14225) (#21695)

* [qt5-base] no _debug lib suffixes on macOS (#14225)

* [qt5-base] patch qt5-base to remove _debug postfix on osx

* Apply suggestions from code review

Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [qt5-base] create link to _debug.pc file from .pc file without _debug

* update version

* [qt5-base] create forward pkgconfig file

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>

* [python3] Support arm (#21528)

* [python3] Support arm on non Windows

* Support arm on all platform, add host dependency

* version

* [pybind11] Add supports

* version

Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>

* [openmvg] update to 2.0 (#22020)

* [openmvg] update to 2.0

* update version

* update patch

* update version

* [brynet] Update to 1.11.1 (#22021)

* brynet: upgrade to 1.11.1

* Update portfile.cmake

* Update brynet.json

* [graphicsmagick] update to version 1.3.37 (#22024)

* [graphicsmagick] update to version 1.3.37

* [graphicsmagick] manifest format

* [graphicsmagick] version database update

* [graphicsmagick] version-string -> version

* [graphicsmagick] version database update

* [meson] fix windows linker detection (#22032)

* fix meson linker detection .....

* bit of code cleanup in vcpkg_configure_meson

* forgot the version stuff

* put cmake back on path because meson is buggy as hell

* [libgpg-error] Release-only build support (#22036)

* [libgpg-error] Release-only build support

* Update version database

* Fix protfile spaces

* Update version database

* [elfutils] provide static or shared libraries correctly (#22055)

The logic for keeping the static or shared libraries according to
VCPKG_LIBRARY_LINKAGE was backwards, and it was providing shared
libraries when they should have been static, and vice versa.

* [gl3w] Use khrplatform.h from the egl-registry port (#22056)

* [gl3w] use khrplatform.h from the egl-registry port

The file was changed yesterday, invalidating the hash: KhronosGroup/EGL-Registry@57b4876de0.

* [gl3w] migrate to new functions from vcpkg-cmake{,-config}

* [gl3w] bump port version

* [caf] Update to 0.18.5 (#22046)

* [caf] Update to 0.18.5

* Remove setting of BUILD_SHARED_LIBS already handled by vcpkg_cmake_configure.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [gmsh] Add new port (#21896)

* add: gmsh

* add: versioning for gmsh.

* [gmsh] Re-factory code

* Fix install, remove some features due to lack required dependencies.

* version

* Do not support uwp officially

* version

* Update ports/gmsh/portfile.cmake

* Update versions/g-/gmsh.json

* Group the options

* version

* version

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>

* [kf5] upgrade to 5.89 (#21890)

* [kf5*] Update to 5.89

* [kf5*] Update versions

* [kf5kio] update tag to rc2

* [kf5kio] update versions

* [kf5*] final 5.89 released

* [kf5*] update versions

* Clean up trailing whitespace and add quotes when naming .clang-format.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

* [ompl] Add vcpkg_check_linkage (#21659)

* [ompl] Add vcpkg_check_linkage

* version

* version

* [pcl] Add feature apps, visualization, simulation, examples and add usage (#21788)

* [pcl] Add feature apps, visualization and examples

* version

* Add simulation

* Enable more apps, install examples, add usage

* format manifest file

* version

* set feature vtk as a alias for feature visualization

* version

* [activemq-cpp] Added missing libuuid dependency (#22059)

This is a mandatory dependency according to
https://github.com/apache/activemq-cpp/blob/master/README.txt

* [optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algorithm for C++ (#22025)

* [optimus-cpp] New port: ID hashing and Obfuscation using Knuth's Algorithm for C++

* Changed reference

* Update version database

* Fix hash

* Update version database

* Review changes and update lib version

* fixver

* Update version database

* Update version database 2

* Fix vcpkg deps

* Update version database

* [tensorflow-common] remove single quotes from vcpkg flags (#21869)

* [vcpkg_acquire_msys] Update bzip2 to 1.0.8-2

* [tensorflow-common] remove single quotes from vcpkg flags

They are escaped like '\'-mtune=native\''  which leads to a compiler error:
cc: error: unrecognized command line option '-mtune=native'
Set via: set(VCPKG_CXX_FLAGS "-mtune=native")

* [sdl2-mixer] Fix link mpg123 error (#22049)

* [sdl2-mixer] Fix link mpg123 error

* update version

Co-authored-by: Lily Wang <v-lilywang@microsoft.com>

* [glog]: update to v0.5

* [glog]: update to v0.5

* [glog]: update to v0.5.0

* [glog] update to version 0.5

* [glog]: update to v0.5.0

* [glog]: update to v0.5.0

* [glog] : update to v0.5.0

* [glog] update to v0.5.0

* [glog] fix log_every_n

* [rsocket]:fix ERROR macro

* add license

* update version

* Revert "[rsocket]:fix ERROR macro"

This reverts commit eb5f21325a.

* [glog]: v0.5 nogdi macro

* [glog]: remove IN OUT macro

* [glog] v0.5

* --amend

* [caffe2] undefinde IN OUT macro

* [glog]: v0.5

* Format portfile.cmake and add license

* update version

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: autoantwort <41973254+autoantwort@users.noreply.github.com>
Co-authored-by: Lars Glud <larshg@gmail.com>
Co-authored-by: GLUD Lars <lars.glud@leica-geosystems.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com>
Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
Co-authored-by: Frank <65999885+FrankXie05@users.noreply.github.com>
Co-authored-by: Kai Pastor <dg0yt@darc.de>
Co-authored-by: Daniel Schürmann <daschuer@mixxx.org>
Co-authored-by: Vitaly <v31337@gmail.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Angus Comrie <accomrie@gmail.com>
Co-authored-by: Li Zeyang <a.banknote@gmail.com>
Co-authored-by: Joachim Gehweiler <44170764+jgehw@users.noreply.github.com>
Co-authored-by: jgehw <Joachim_Gehweiler@McAfee.com>
Co-authored-by: Alexander Neumann <30894796+Neumann-A@users.noreply.github.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: IronsDu <irons.du@gmail.com>
Co-authored-by: Josue Andrade Gomes <josuegomes@gmail.com>
Co-authored-by: Clayton Wheeler <cswheeler@gmail.com>
Co-authored-by: Christian Fillion <cfillion@users.noreply.github.com>
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Co-authored-by: X.ZhaoMa <ma@arch.ethz.ch>
Co-authored-by: Dawid Wróbel <me@dawidwrobel.com>
2022-04-08 15:19:47 -07:00

78 lines
2.6 KiB
Diff

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 28e2688..cf87798 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -843,36 +843,6 @@ write_basic_package_version_file (
export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
export (PACKAGE glog)
-get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
-
-# Directory containing the find modules relative to the config install
-# directory.
-file (RELATIVE_PATH glog_REL_CMake_MODULES
- ${_PREFIX}/${_glog_CMake_INSTALLDIR}
- ${_PREFIX}/${_glog_CMake_DATADIR}/glog-modules.cmake)
-
-get_filename_component (glog_REL_CMake_DATADIR ${glog_REL_CMake_MODULES}
- DIRECTORY)
-
-set (glog_FULL_CMake_DATADIR
- ${CMAKE_CURRENT_BINARY_DIR}/${_glog_CMake_DATADIR})
-
-configure_file (glog-modules.cmake.in
- ${CMAKE_CURRENT_BINARY_DIR}/glog-modules.cmake @ONLY)
-
-install (CODE
-"
-set (glog_FULL_CMake_DATADIR \"\\\${CMAKE_CURRENT_LIST_DIR}/${glog_REL_CMake_DATADIR}\")
-configure_file (\"${CMAKE_CURRENT_SOURCE_DIR}/glog-modules.cmake.in\"
- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\" @ONLY)
-file (INSTALL
- \"${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/glog-modules.cmake\"
- DESTINATION
- \"\${CMAKE_INSTALL_PREFIX}/${_glog_CMake_INSTALLDIR}\")
-"
- COMPONENT Development
-)
-
install (FILES
${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake
${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake
diff --git a/glog-config.cmake.in b/glog-config.cmake.in
index 5c5c9c0..31fac52 100644
--- a/glog-config.cmake.in
+++ b/glog-config.cmake.in
@@ -5,7 +5,6 @@ endif (CMAKE_VERSION VERSION_LESS @glog_CMake_VERSION@)
@PACKAGE_INIT@
include (CMakeFindDependencyMacro)
-include (${CMAKE_CURRENT_LIST_DIR}/glog-modules.cmake)
@gflags_DEPENDENCY@
@Unwind_DEPENDENCY@
diff --git a/glog-modules.cmake.in b/glog-modules.cmake.in
deleted file mode 100644
index 71c5160..0000000
--- a/glog-modules.cmake.in
+++ /dev/null
@@ -1,18 +0,0 @@
-cmake_policy (PUSH)
-cmake_policy (SET CMP0057 NEW)
-
-if (CMAKE_VERSION VERSION_LESS 3.3)
- message (FATAL_ERROR "glog-modules.cmake requires the consumer "
- "to use CMake 3.3 (or newer)")
-endif (CMAKE_VERSION VERSION_LESS 3.3)
-
-set (glog_MODULE_PATH "@glog_FULL_CMake_DATADIR@")
-list (APPEND CMAKE_MODULE_PATH ${glog_MODULE_PATH})
-
-if (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH)
- message (FATAL_ERROR "Cannot add '${glog_MODULE_PATH}' to "
- "CMAKE_MODULE_PATH. This will cause glog-config.cmake to fail at "
- "locating required find modules. Make sure CMAKE_MODULE_PATH is not a cache variable.")
-endif (NOT glog_MODULE_PATH IN_LIST CMAKE_MODULE_PATH)
-
-cmake_policy (POP)