2019-05-01 07:54:33 +08:00
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
[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-21 10:11:54 +08:00
|
|
|
index 02c72b5..62d8c59 100644
|
2019-05-01 07:54:33 +08:00
|
|
|
--- a/CMakeLists.txt
|
|
|
|
|
+++ b/CMakeLists.txt
|
|
|
|
|
@@ -374,27 +374,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)
|
[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-21 10:11:54 +08:00
|
|
|
@@ -582,7 +562,7 @@ include_directories(
|
|
|
|
|
# Note that this is *not* propagated to clients, ie CERES_INCLUDE_DIRS
|
|
|
|
|
# used by clients after find_package(Ceres) does not identify Eigen as
|
|
|
|
|
# as system headers.
|
|
|
|
|
-include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS})
|
|
|
|
|
+include_directories(SYSTEM ${EIGEN_INCLUDE_DIRS} ${EIGEN_INCLUDE_DIRS}/Eigen)
|
|
|
|
|
|
|
|
|
|
if (SUITESPARSE)
|
|
|
|
|
include_directories(${SUITESPARSE_INCLUDE_DIRS})
|
2019-05-01 07:54:33 +08:00
|
|
|
@@ -917,8 +897,6 @@ install(FILES "${Ceres_BINARY_DIR}/CeresConfig-install.cmake"
|
|
|
|
|
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
|
|
|
|
install(FILES "${Ceres_BINARY_DIR}/CeresConfigVersion.cmake"
|
|
|
|
|
"${Ceres_SOURCE_DIR}/cmake/FindEigen.cmake"
|
|
|
|
|
- "${Ceres_SOURCE_DIR}/cmake/FindGlog.cmake"
|
|
|
|
|
- "${Ceres_SOURCE_DIR}/cmake/FindGflags.cmake"
|
|
|
|
|
DESTINATION ${RELATIVE_CMAKECONFIG_INSTALL_DIR})
|
|
|
|
|
|
|
|
|
|
# Create an uninstall target to remove all installed files.
|