mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 04:29:01 +08:00
e03ee9cace
* [ceres, zziplib] fixes for building on non-windows systems * [jxrlib, zziplib] other fixes for non-windows systems * [zziplib] fix CMakeLists.txt for non win32 platforms, there were missing exported headers * [ceres] Fix targets path * [ceres] Fix typo * [ceres] trigger CI build * [ceres] use proper glog/gflags targets
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
diff --git a/internal/ceres/CMakeLists.txt b/internal/ceres/CMakeLists.txt
|
|
index cc43fec..18b415b 100644
|
|
--- a/internal/ceres/CMakeLists.txt
|
|
+++ b/internal/ceres/CMakeLists.txt
|
|
@@ -152,17 +152,9 @@ else (SCHUR_SPECIALIZATIONS)
|
|
endif (SCHUR_SPECIALIZATIONS)
|
|
|
|
# Build the list of dependencies for Ceres based on the current configuration.
|
|
-if (NOT MINIGLOG AND GLOG_FOUND)
|
|
- list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GLOG_LIBRARIES})
|
|
- if (GFLAGS_FOUND)
|
|
- # If glog & gflags are both found, we assume that glog was built with
|
|
- # gflags, as it is awkward to perform a try_compile() to verify this
|
|
- # when gflags is an imported target (as it is in newer versions).
|
|
- # As glog #includes gflags/gflags.h in glog/logging.h if compiled with
|
|
- # gflags, it is thus a public dependency for Ceres in this case.
|
|
- list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES ${GFLAGS_LIBRARIES})
|
|
- endif()
|
|
-endif (NOT MINIGLOG AND GLOG_FOUND)
|
|
+if (NOT MINIGLOG)
|
|
+ list(APPEND CERES_LIBRARY_PUBLIC_DEPENDENCIES glog::glog)
|
|
+endif (NOT MINIGLOG)
|
|
|
|
if (SUITESPARSE AND SUITESPARSE_FOUND)
|
|
# Define version information for use in Solver::FullReport.
|