mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-03 07:26:41 +08:00
683c1dfd2d
- [X] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md) - [X] SHA512s are updated for each updated download - [ ] ~The "supports" clause reflects platforms that may be fixed by this new version~ - [ ] ~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~ - [ ] ~Any patches that are no longer applied are deleted from the port's directory.~ - [X] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [X] Only one version is added to each modified port's versions file.
34 lines
903 B
Diff
34 lines
903 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index b787631..41bf110 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -1000,7 +1000,7 @@ write_basic_package_version_file (
|
|
|
|
export (TARGETS glog NAMESPACE glog:: FILE glog-targets.cmake)
|
|
export (PACKAGE glog)
|
|
-
|
|
+if(0)
|
|
get_filename_component (_PREFIX "${CMAKE_INSTALL_PREFIX}" ABSOLUTE)
|
|
|
|
# Directory containing the find modules relative to the config install
|
|
@@ -1036,6 +1036,7 @@ file (INSTALL
|
|
"
|
|
COMPONENT Development
|
|
)
|
|
+endif()
|
|
|
|
install (FILES
|
|
${glog_BINARY_DIR}/glog-config.cmake
|
|
diff --git a/glog-config.cmake.in b/glog-config.cmake.in
|
|
index 7d98525..93bc7d9 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)
|
|
|
|
find_dependency (Threads)
|
|
|