3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-28 19:25:27 +08:00
Code Issues Projects Releases Wiki Activity

revert config file changes and remove unused copies

Browse Source
This commit is contained in:
Han Hu 2017-04-20 10:15:42 +08:00
parent c31c026c12
commit 42085918a8
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ports/glog/fix-cmake-install-files.patch
View File

@ -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 lib/cmake/glog)
+install (EXPORT glog-targets NAMESPACE glog:: DESTINATION share/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)

5
ports/glog/portfile.cmake
View File

@ -31,10 +31,7 @@ vcpkg_install_cmake()
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share)
file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/glog) file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share/glog)
file(GLOB GLOG_CMAKE_FILES file(GLOB GLOG_CMAKE_FILES ${CURRENT_PACKAGES_DIR}/debug/share/glog/*.cmake)
${CURRENT_PACKAGES_DIR}/cmake/lib/glog/*.cmake
${CURRENT_PACKAGES_DIR}/debug/lib/cmake/glog/*.cmake
${CURRENT_PACKAGES_DIR}/debug/share/glog/*.cmake)
file(COPY ${GLOG_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/glog) file(COPY ${GLOG_CMAKE_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/share/glog)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)