saberbud/ceres-solver
1
0
Fork 0
mirror of https://github.com/ceres-solver/ceres-solver.git synced 2026-08-29 16:40:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix suppression of C++11 propagation warning.

Browse Source 
- Since the update to optionally use target_compile_features(), the
  warning about Ceres propagating C++11 compile flag requirements to
  clients was suppressed dependent upon the compiler option selected by
  CMake to satisfy the C++11 requirements for Ceres (e.g. if using
  -std=gnu++11 instead of -std=c++11).
- Now we display the warning for all CMake versions where any C++11
  related flags can be exported in the Ceres target (CMake >= 2.8.12)
  if Ceres was compiled with the CXX11 option enabled.

Change-Id: I5cb91e773fc7c41996b5eabadcaa295ebd7de4f7
This commit is contained in:
Alex Stewart
2017-08-09 09:58:03 +01:00
parent 2d703b17b5
commit f58eacf082
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/CeresConfig.cmake.in
+9 -11
View File
@@ -326,24 +326,22 @@ set(CERES_LIBRARIES ceres)
# Make user aware of any compile flags that will be added to their targets
# which use Ceres (i.e. flags exported in the Ceres target). Only CMake
# versions >= 2.8.12 support target_compile_options().
# versions >= 2.8.12 support target_compile_options/features().
if (CERES_COMPILED_COMPONENTS MATCHES ".*C\\+\\+11.*") # Search for C++11.
set(CERES_WAS_COMPILED_WITH_CXX11 TRUE)
endif()
if (TARGET ${CERES_LIBRARIES} AND
CERES_WAS_COMPILED_WITH_CXX11 AND
NOT CMAKE_VERSION VERSION_LESS "2.8.12")
get_target_property(CERES_INTERFACE_COMPILE_OPTIONS
${CERES_LIBRARIES} INTERFACE_COMPILE_OPTIONS)
if (CERES_WAS_INSTALLED)
set(CERES_LOCATION "${CURRENT_ROOT_INSTALL_DIR}")
else()
set(CERES_LOCATION "${CERES_EXPORTED_BUILD_DIR}")
endif()
# Check for -std=c++11 flags.
if (CERES_INTERFACE_COMPILE_OPTIONS MATCHES ".*std=c\\+\\+11.*")
message(STATUS "Ceres version ${CERES_VERSION} detected here: "
"${CERES_LOCATION} was built with C++11. Ceres target will add "
"C++11 flags to compile options for targets using it.")
endif()
message(STATUS "Ceres version ${CERES_VERSION} detected here: "
"${CERES_LOCATION} was built with C++11. Ceres "
"target will add C++11 flags to compile options for "
"targets using it.")
endif()
# Set legacy include directories variable for backwards compatibility.