mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-23 19:27:50 +08:00
5898891125
* [openexr,openimageio,suitesparse,theia] updates for non-win32 * [theia] use only valid cmake symbols * [suitesparse] Fix build * [lapack] still not properly integrating with other ports * [lapack] intercept cmake module calls and substitute them with our defs * [suitesparse,clapack] fixes for proper integration * [ceres,clapack] bump CONTROL * [suitesparse] remove unnecessary defs * [clapack] improve wrapper logic * [WIN32] remove wrong symbol * [clapack] fix wrapper integration * [Accelerate] use best framework when available * [clapack] separate config from wrapper * [clapack] fix paths and filenames * [mlpack,armadillo,clapack] improve library handling * [mlpack] remove unnecessary cmake option * [clp,coinutils,osi,liblemon] dependencies of openmvg, improve compatibility with non-win32 * [openmvg] fix for case-sensitive filesystems * [clp,coinutils,osi] simplify CMakeLists removing many unnecessary steps * [sophus] Force rebuild * [theia] fixes for linux, part1 * [io2d] remove broken sintax * [fontconfig] bump version to remove CI cached failure * [theia] fixes for linux, part2 * [theia] remove unnecessary empty folders and comments from portfile * [theia] use correct build type removing forced vars in cmakelists.txt * [openmvg] add missing suitesparse target detection * [sophus] fix Suitesparse dependency * [sophus,openmvg] use suitesparse lowercase for module compatibility on case-sensitive filesystems * [suitesparse] fixes for case-sensitive filesystems * [openmvg] use correct Eigen3 name for case-sensitive filesystems * [sophus] trigger rebuild * [shogun] use modern vcpkg style * [shogun] add missing cmake system processor symbol
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.
|