diff options
| author | Han Hu <huhan8807@gmail.com> | 2017-04-20 10:15:42 +0800 |
|---|---|---|
| committer | Han Hu <huhan8807@gmail.com> | 2017-04-20 10:15:42 +0800 |
| commit | 42085918a8e22d47005596bcf388dace08d5e440 (patch) | |
| tree | c37f5bb1616aa22b8b53b0e330c750d1e60283dd | |
| parent | c31c026c12e7ad86b2ce5d523dbb2801aaf1a658 (diff) | |
| download | vcpkg-42085918a8e22d47005596bcf388dace08d5e440.tar.gz vcpkg-42085918a8e22d47005596bcf388dace08d5e440.zip | |
revert config file changes and remove unused copies
| -rw-r--r-- | ports/glog/fix-cmake-install-files.patch | 15 | ||||
| -rw-r--r-- | ports/glog/portfile.cmake | 5 |
2 files changed, 1 insertions, 19 deletions
diff --git a/ports/glog/fix-cmake-install-files.patch b/ports/glog/fix-cmake-install-files.patch index 7ceb30f3b..34f6f07f3 100644 --- a/ports/glog/fix-cmake-install-files.patch +++ b/ports/glog/fix-cmake-install-files.patch @@ -30,18 +30,3 @@ index 1429590..5ed110d 100644 -install (EXPORT glog-targets NAMESPACE glog:: DESTINATION lib/cmake/glog) +install (EXPORT glog-targets NAMESPACE glog:: DESTINATION share/glog) -diff --git a/glog-config.cmake.in b/glog-config.cmake.in -index e3c44ae..fb59e95 100644 ---- a/glog-config.cmake.in -+++ b/glog-config.cmake.in -@@ -5,3 +5,10 @@ include (CMakeFindDependencyMacro) - @gflags_DEPENDENCY@ - - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") -+ -+# set common names for FindGlog -+# should be installed to ${CMAKE_INSTALL_PREFIX}/share/glog -+set(GLOG_FOUND ON) -+set(GLOG_INCLUDE_DIRS "${CMAKE_CURRENT_LIST_DIR}/../../include") -+set(GLOG_LIBRARIES glog::glog) -+set_target_properties(${GLOG_LIBRARIES} PROPERTIES MAP_IMPORTED_CONFIG_RELWITHDEBINFO RELEASE) diff --git a/ports/glog/portfile.cmake b/ports/glog/portfile.cmake index 332a58bf4..d981c7e27 100644 --- a/ports/glog/portfile.cmake +++ b/ports/glog/portfile.cmake @@ -31,10 +31,7 @@ vcpkg_install_cmake() file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/glog) -file(GLOB GLOG_CMAKE_FILES - ${CURRENT_PACKAGES_DIR}/cmake/lib/glog/*.cmake - ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/glog/*.cmake - ${CURRENT_PACKAGES_DIR}/debug/share/glog/*.cmake) +file(GLOB GLOG_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/debug/share/glog/*.cmake) file(COPY ${GLOG_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/glog) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) |