This repository has been archived by the owner on Oct 26, 2018. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix compilation error when using G++ compiler
This compiler defines shared_ptr in std::tr1 namespace, but for this <tr1/memory> is to be included. Further, this compiler also does have <memory> header which confused previous shared pointer check. Simplified logic around defines now, so currently we've got: - CERES_TR1_MEMORY_HEADER defined if <tr1/memory> is to be used for shared_ptr, otherwise <memory> is to be used. - CERES_TR1_SHARED_PTR defined if shared_ptr is defined in std::tr1 namespace, otherwise it's defined in std namespace. All the shared_ptr checks are now moved to own file FindSharedPtr which simplifies main CMakeLists. Change-Id: I558a74793baaa0bd088801910a356be4ef17c31b
- Loading branch information
Showing
4 changed files
with
112 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,99 @@ | ||
| # Ceres Solver - A fast non-linear least squares minimizer | ||
| # Copyright 2014 Google Inc. All rights reserved. | ||
| # http://code.google.com/p/ceres-solver/ | ||
| # | ||
| # Redistribution and use in source and binary forms, with or without | ||
| # modification, are permitted provided that the following conditions are met: | ||
| # | ||
| # * Redistributions of source code must retain the above copyright notice, | ||
| # this list of conditions and the following disclaimer. | ||
| # * Redistributions in binary form must reproduce the above copyright notice, | ||
| # this list of conditions and the following disclaimer in the documentation | ||
| # and/or other materials provided with the distribution. | ||
| # * Neither the name of Google Inc. nor the names of its contributors may be | ||
| # used to endorse or promote products derived from this software without | ||
| # specific prior written permission. | ||
| # | ||
| # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| # AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| # IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| # ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| # LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| # POSSIBILITY OF SUCH DAMAGE. | ||
| # | ||
| # Author: [email protected] (Sergey Sharybin) | ||
| # | ||
|
|
||
| # FindSharedPtr.cmake - Find shared pointer header and namespace. | ||
| # | ||
| # This module defines the following variables: | ||
| # | ||
| # SHARED_PTR_FOUND: TRUE if shared_ptr found. | ||
| # SHARED_PTR_TR1_MEMORY_HEADER: True if <tr1/memory> header is to be used | ||
| # for the shared_ptr object, otherwise use <memory>. | ||
| # SHARED_PTR_TR1_NAMESPACE: TRUE if shared_ptr is defined in std::tr1 namespace, | ||
| # otherwise it's assumed to be defined in std namespace. | ||
|
|
||
| MACRO(FIND_SHARED_PTR) | ||
| SET(SHARED_PTR_FOUND FALSE) | ||
| CHECK_INCLUDE_FILE_CXX(memory HAVE_STD_MEMORY_HEADER) | ||
| IF (HAVE_STD_MEMORY_HEADER) | ||
| # Finding the memory header doesn't mean that shared_ptr is in std | ||
| # namespace. | ||
| # | ||
| # In particular, MSVC 2008 has shared_ptr declared in std::tr1. In | ||
| # order to support this, we do an extra check to see which namespace | ||
| # should be used. | ||
| INCLUDE(CheckCXXSourceCompiles) | ||
| CHECK_CXX_SOURCE_COMPILES("#include <memory> | ||
| int main() { | ||
| std::shared_ptr<int> int_ptr; | ||
| return 0; | ||
| }" | ||
| HAVE_SHARED_PTR_IN_STD_NAMESPACE) | ||
|
|
||
| IF (HAVE_SHARED_PTR_IN_STD_NAMESPACE) | ||
| MESSAGE("-- Found shared_ptr in std namespace using <memory> header.") | ||
| SET(SHARED_PTR_FOUND TRUE) | ||
| ELSE (HAVE_SHARED_PTR_IN_STD_NAMESPACE) | ||
| CHECK_CXX_SOURCE_COMPILES("#include <memory> | ||
| int main() { | ||
| std::tr1::shared_ptr<int> int_ptr; | ||
| return 0; | ||
| }" | ||
| HAVE_SHARED_PTR_IN_TR1_NAMESPACE) | ||
| IF (HAVE_SHARED_PTR_IN_TR1_NAMESPACE) | ||
| MESSAGE("-- Found shared_ptr in std::tr1 namespace using <memory> header.") | ||
| SET(SHARED_PTR_TR1_NAMESPACE TRUE) | ||
| SET(SHARED_PTR_FOUND TRUE) | ||
| ENDIF (HAVE_SHARED_PTR_IN_TR1_NAMESPACE) | ||
| ENDIF (HAVE_SHARED_PTR_IN_STD_NAMESPACE) | ||
| ENDIF (HAVE_STD_MEMORY_HEADER) | ||
|
|
||
| IF (NOT SHARED_PTR_FOUND) | ||
| # Further, gcc defines shared_ptr in std::tr1 namespace and | ||
| # <tr1/memory> is to be included for this. And what makes things | ||
| # even more tricky is that gcc does have <memory> header, so | ||
| # all the checks above wouldn't find shared_ptr. | ||
| CHECK_INCLUDE_FILE_CXX("tr1/memory" HAVE_TR1_MEMORY_HEADER) | ||
| IF (HAVE_TR1_MEMORY_HEADER) | ||
| CHECK_CXX_SOURCE_COMPILES("#include <tr1/memory> | ||
| int main() { | ||
| std::tr1::shared_ptr<int> int_ptr; | ||
| return 0; | ||
| }" | ||
| HAVE_SHARED_PTR_IN_TR1_NAMESPACE_FROM_TR1_MEMORY_HEADER) | ||
| IF (HAVE_SHARED_PTR_IN_TR1_NAMESPACE_FROM_TR1_MEMORY_HEADER) | ||
| MESSAGE("-- Found shared_ptr in std::tr1 namespace using <tr1/memory> header.") | ||
| SET(SHARED_PTR_TR1_MEMORY_HEADER TRUE) | ||
| SET(SHARED_PTR_TR1_NAMESPACE TRUE) | ||
| SET(SHARED_PTR_FOUND TRUE) | ||
| ENDIF (HAVE_SHARED_PTR_IN_TR1_NAMESPACE_FROM_TR1_MEMORY_HEADER) | ||
| ENDIF (HAVE_TR1_MEMORY_HEADER) | ||
| ENDIF (NOT SHARED_PTR_FOUND) | ||
| ENDMACRO(FIND_SHARED_PTR) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters