vcpkg/ports/ceres/0003_fix_exported_ceres_config.patch
Stefano Sinigardi 47d206e149 [many ports] improvements for linux/wsl (#6730)
* [many ports] improve compatibility with WSL and mixed case filesystems

* [treehopper] express dependency on libusb, which was not working on non-win32 platforms and is still broken there

* [libharu] add compatibility with non-win32 platforms

* [geogram] fix openblas on linux
[clapack] better integration with linux environment
[visit-struct] put cmake config file in the expected folder
[geogram] remove trailing underscore to enable compatibility with OpenBLAS

* [openblas] playing with underscore, without success

* [openblas/lapack] fix library integration

* [clapack] improve target handling in cmake module

* [openblas] promote self-generated config to default cmake module, otherwise internal ones thinks wrongly that openblas can also solve lapack libs

* [clapack,openblas] improve libraries integration

* [many ports] fix cmake unnecessary target paths, wrong config paths, empty default dependencies, unnecessary [core] tags

* [suitesparse] improve integration with new lapack/openblas mechanism

* [suitesparse] add no underscore postfix also for linux

* [ceres] fix integration with newer openblas/lapack configs

* [aws-c-event-stream] fix regression

* [systemc] fix regression

* [libwebp,geogram] trigger rebuild

* [libwebp,pthread4w] fix regressions

* [glbinding] fix cmake module installation

* [globjects] disentangle unnecessary dependency from qt5

* [jasper] remove broken and unnecessary patches

* [libwebp] fix regression

* [many ports] avoid using BUILD_SHARED_LIBS which is uninitialized in port files

* [clapack] correctly find dlls

* [clapack] use a generic blas as dependency

* [fizz,g2o] restore expected version

* fix mistake

* [many ports] remove WIN32, APPLE and UNIX (again, they keep creeping in) from ports since they are broken and usually break non-win32 ports

* [libressl,openssl] do not try to build one if the other is already installed

* [itk] update ref and patch to avoid regression

* [libressl,openssl] implement full strategy to fix CI

* [libwebp] disable components that are broken on macOS

* [ogre] enable macOS build

* [freeimage,jxrlib,ogre,openexr,protobuf] port patches from #5169

* [ogre] add missing install command

* [ffmpeg] enable wrapper for cmake module

* [ffmpeg] add avresample module finder

* [ffmpeg] improve module detection and exported symbols

* [ffmpeg] add variables to cache

* [thrift] remove unnecessary build option

* [allegro5] fix shared/static inversion

* [protobuf] cleanup

* [libressl] cleanup

* [moos-core] cleanup

* commented features must not be separated from other features, otherwise vcpkg complains

* [itk] fix regression

* [shogun,itk] fix regressions

* [ogre] fix regression

* [opusfile] add compatibility with non-win32

* [itk] fix regression

* [sndfile,libsndfile] remove duplicate, redirect sndfile to libsndfile

* add missing dependencies

* [ismrmrd] fix regression

* [ffmpeg] trigger rebuild

* [clapack,openblas,libogg] fix regressions on macOS

* [libtins] fix regression

* force rebuild windows regressions, unable to reproduce locally

* [mosquitto] enable non-win32 builds

* [json-dto] force rebuild, unable to reproduce regression locally

* [many ports] uniform naming and path length requests

* fix regression

* fix regression

* [ffmpeg] fixes for downstream projects

* clean up - thanks to reviewers

* trigger rebuild of regressions on macOS

* trigger rebuild of regressions on macOS - part2

* Add core back

* Use VCPKG_CONCURRENCY

* Add core back to suitesparse

* Add core back to curl

* Add core back to magnum

* Add core back to magnum

* Add core back to magnum

* Add core back to cgal
2019-06-20 19:11:54 -07:00

93 lines
4.2 KiB
Diff

diff --git a/cmake/CeresConfig.cmake.in b/cmake/CeresConfig.cmake.in
index d0380de..bf4c2eb 100644
--- a/cmake/CeresConfig.cmake.in
+++ b/cmake/CeresConfig.cmake.in
@@ -237,85 +237,8 @@ endif (EIGEN_FOUND)
list(APPEND CERES_INCLUDE_DIRS ${EIGEN_INCLUDE_DIRS})
# Glog.
-# Flag set during configuration and build of Ceres.
-set(CERES_USES_MINIGLOG @MINIGLOG@)
-set(CERES_USES_GFLAGS @GFLAGS@)
-if (CERES_USES_MINIGLOG)
- set(MINIGLOG_INCLUDE_DIR ${CERES_INCLUDE_DIR}/ceres/internal/miniglog)
- if (NOT CERES_WAS_INSTALLED)
- # When Ceres was exported from the build tree, the miniglog headers
- # will be in Ceres internal source directory, not in the public headers
- # directory (they are copied with the public headers when installed).
- set(MINIGLOG_INCLUDE_DIR
- ${CERES_EXPORTED_SOURCE_DIR}/internal/ceres/miniglog)
- endif()
- if (NOT EXISTS ${MINIGLOG_INCLUDE_DIR})
- ceres_report_not_found(
- "Failed to find miniglog headers in expected include directory: "
- "${MINIGLOG_INCLUDE_DIR}, but Ceres was compiled with MINIGLOG enabled "
- "(in place of glog).")
- endif (NOT EXISTS ${MINIGLOG_INCLUDE_DIR})
- list(APPEND CERES_INCLUDE_DIRS ${MINIGLOG_INCLUDE_DIR})
- # Output message at standard log level (not the lower STATUS) so that
- # the message is output in GUI during configuration to warn user.
- message("-- Found Ceres compiled with miniglog substitute "
- "for glog, beware this will likely cause problems if glog is later linked.")
-else (CERES_USES_MINIGLOG)
- # Append the locations of glog when Ceres was built to the search path hints.
- set(GLOG_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GLOG_CMAKE_CONFIGURATION@)
- if (GLOG_WAS_BUILT_WITH_CMAKE)
- set(glog_DIR @glog_DIR@)
- set(GLOG_PREFER_EXPORTED_GLOG_CMAKE_CONFIGURATION TRUE)
- else()
- list(APPEND GLOG_INCLUDE_DIR_HINTS @GLOG_INCLUDE_DIR@)
- get_filename_component(CERES_BUILD_GLOG_LIBRARY_DIR @GLOG_LIBRARY@ PATH)
- list(APPEND GLOG_LIBRARY_DIR_HINTS ${CERES_BUILD_GLOG_LIBRARY_DIR})
- endif()
-
- # Search quietly s/t we control the timing of the error message if not found.
- find_package(Glog QUIET)
- if (GLOG_FOUND)
- message(STATUS "Found required Ceres dependency: glog")
- else (GLOG_FOUND)
- ceres_report_not_found("Missing required Ceres "
- "dependency: glog. Searched using GLOG_INCLUDE_DIR_HINTS: "
- "${GLOG_INCLUDE_DIR_HINTS} and glog_DIR: ${glog_DIR}.")
- endif (GLOG_FOUND)
- list(APPEND CERES_INCLUDE_DIRS ${GLOG_INCLUDE_DIRS})
-
- # gflags is only a public dependency of Ceres via glog, thus is not required
- # if Ceres was built with MINIGLOG.
- if (CERES_USES_GFLAGS)
- # If gflags was found as an imported CMake target, we need to call
- # find_packge(Gflags) again here, as imported CMake targets are not
- # re-exported. Without this, the 'gflags-shared' target name which is
- # present in CERES_LIBRARIES in this case would not be defined, and so
- # CMake will assume it is a library name (which it is not) and fail to link.
- #
- # Append the locations of gflags when Ceres was built to the search path
- # hints.
- set(GFLAGS_WAS_BUILT_WITH_CMAKE @FOUND_INSTALLED_GFLAGS_CMAKE_CONFIGURATION@)
- if (GFLAGS_WAS_BUILT_WITH_CMAKE)
- set(gflags_DIR @gflags_DIR@)
- set(GFLAGS_PREFER_EXPORTED_GFLAGS_CMAKE_CONFIGURATION TRUE)
- else()
- list(APPEND GFLAGS_INCLUDE_DIR_HINTS @GFLAGS_INCLUDE_DIR@)
- get_filename_component(CERES_BUILD_GFLAGS_LIBRARY_DIR @GFLAGS_LIBRARY@ PATH)
- list(APPEND GFLAGS_LIBRARY_DIR_HINTS ${CERES_BUILD_GFLAGS_LIBRARY_DIR})
- endif()
-
- # Search quietly s/t we control the timing of the error message if not found.
- find_package(Gflags QUIET)
- if (GFLAGS_FOUND)
- message(STATUS "Found required Ceres dependency: gflags")
- else()
- ceres_report_not_found("Missing required Ceres "
- "dependency: gflags. Searched using GFLAGS_INCLUDE_DIR_HINTS: "
- "${GFLAGS_INCLUDE_DIR_HINTS} and gflags_DIR: ${gflags_DIR}.")
- endif()
- list(APPEND CERES_INCLUDE_DIRS ${GFLAGS_INCLUDE_DIR_HINTS})
- endif()
-endif (CERES_USES_MINIGLOG)
+include (CMakeFindDependencyMacro)
+find_dependency (glog NO_MODULE)
# Import exported Ceres targets, if they have not already been imported.
if (NOT TARGET ceres AND NOT Ceres_BINARY_DIR)