mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-06 05:29:01 +08:00
47 lines
2.1 KiB
Diff
47 lines
2.1 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 33e98b1..f275d68 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -426,27 +426,7 @@ if (MINIGLOG)
|
|
GLOG_LIBRARY)
|
|
else (MINIGLOG)
|
|
unset(MINIGLOG_MAX_LOG_LEVEL CACHE)
|
|
- # Don't search with REQUIRED so that configuration continues if not found and
|
|
- # we can output an error messages explaining MINIGLOG option.
|
|
- find_package(Glog)
|
|
- if (NOT GLOG_FOUND)
|
|
- message(FATAL_ERROR "Can't find Google Log (glog). Please set either: "
|
|
- "glog_DIR (newer CMake built versions of glog) or GLOG_INCLUDE_DIR & "
|
|
- "GLOG_LIBRARY or enable MINIGLOG option to use minimal glog "
|
|
- "implementation.")
|
|
- endif(NOT GLOG_FOUND)
|
|
- # By default, assume gflags was found, updating the message if it was not.
|
|
- set(GLOG_GFLAGS_DEPENDENCY_MESSAGE
|
|
- " Assuming glog was built with gflags support as gflags was found. "
|
|
- "This will make gflags a public dependency of Ceres.")
|
|
- if (NOT gflags_FOUND)
|
|
- set(GLOG_GFLAGS_DEPENDENCY_MESSAGE
|
|
- " Assuming glog was NOT built with gflags support as gflags was "
|
|
- "not found. If glog was built with gflags, please set the "
|
|
- "gflags search locations such that it can be found by Ceres. "
|
|
- "Otherwise, Ceres may fail to link due to missing gflags symbols.")
|
|
- endif(NOT gflags_FOUND)
|
|
- message("-- Found Google Log (glog)." ${GLOG_GFLAGS_DEPENDENCY_MESSAGE})
|
|
+ find_package(Glog REQUIRED)
|
|
endif (MINIGLOG)
|
|
|
|
if (NOT SCHUR_SPECIALIZATIONS)
|
|
@@ -760,12 +740,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
|
|
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
|
install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"
|
|
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
|
-if (GLOG_FOUND AND NOT FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION)
|
|
- # Version of glog detected was not built with CMake, install our glog module
|
|
- # file to enable detection in CeresConfig.
|
|
- install(FILES "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake"
|
|
- DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
|
-endif()
|
|
|
|
if (PROVIDE_UNINSTALL_TARGET)
|
|
# Create an uninstall target to remove all installed files.
|