diff options
author | Carlos Hernandez <chernand@google.com> | 2014-08-07 17:51:38 -0700 |
---|---|---|
committer | Carlos Hernandez <chernand@google.com> | 2014-08-11 20:38:34 +0000 |
commit | 79397c21138f54fcff6ec067b44b847f1f7e0e98 (patch) | |
tree | b2c33877af479b37f082fcbcaf50a24a49b69415 /cmake/depend.cmake | |
parent | ad78e589f893a53da23bbdf41274d89dae656f54 (diff) | |
download | ceres-solver-android-cts-5.1_r21.tar.gz |
Update ceres to the latest version in g3android-wear-5.0.0_r1android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-release
Please pay special attention to the changes in Android.mk.
They are the only real changes I had to make.
Bug: 16953678
Change-Id: I44a644358e779aaff99a2ea822387fe49ac26888
Diffstat (limited to 'cmake/depend.cmake')
-rw-r--r-- | cmake/depend.cmake | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/cmake/depend.cmake b/cmake/depend.cmake deleted file mode 100644 index 275a440..0000000 --- a/cmake/depend.cmake +++ /dev/null @@ -1,103 +0,0 @@ -# Ceres Solver - A fast non-linear least squares minimizer -# Copyright 2013 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: pablo.speciale@gmail.com (Pablo Speciale) -# - -# Default locations to search for on various platforms. -LIST(APPEND SEARCH_LIBS /usr/lib) -LIST(APPEND SEARCH_LIBS /usr/local/lib) -LIST(APPEND SEARCH_LIBS /usr/local/homebrew/lib) # Mac OS X -LIST(APPEND SEARCH_LIBS /opt/local/lib) - -LIST(APPEND SEARCH_HEADERS /usr/include) -LIST(APPEND SEARCH_HEADERS /usr/local/include) -LIST(APPEND SEARCH_HEADERS /usr/local/homebrew/include) # Mac OS X -LIST(APPEND SEARCH_HEADERS /opt/local/include) - -# Locations to search for Eigen -SET(EIGEN_SEARCH_HEADERS ${SEARCH_HEADERS}) -LIST(APPEND EIGEN_SEARCH_HEADERS /usr/include/eigen3) # Ubuntu 10.04's default location. -LIST(APPEND EIGEN_SEARCH_HEADERS /usr/local/include/eigen3) -LIST(APPEND EIGEN_SEARCH_HEADERS /usr/local/homebrew/include/eigen3) # Mac OS X -LIST(APPEND EIGEN_SEARCH_HEADERS /opt/local/var/macports/software/eigen3/opt/local/include/eigen3) # Mac OS X - -# Google Flags -OPTION(GFLAGS - "Enable Google Flags." - ON) - -IF (GFLAGS) - MESSAGE("-- Check for Google Flags") - FIND_LIBRARY(GFLAGS_LIB NAMES gflags PATHS ${SEARCH_LIBS}) - IF (NOT EXISTS ${GFLAGS_LIB}) - MESSAGE(FATAL_ERROR - "Can't find Google Flags. Please specify: " - "-DGFLAGS_LIB=...") - ENDIF (NOT EXISTS ${GFLAGS_LIB}) - MESSAGE("-- Found Google Flags library: ${GFLAGS_LIB}") - FIND_PATH(GFLAGS_INCLUDE NAMES gflags/gflags.h PATHS ${SEARCH_HEADERS}) - IF (NOT EXISTS ${GFLAGS_INCLUDE}) - MESSAGE(FATAL_ERROR - "Can't find Google Flags. Please specify: " - "-DGFLAGS_INCLUDE=...") - ENDIF (NOT EXISTS ${GFLAGS_INCLUDE}) - MESSAGE("-- Found Google Flags header in: ${GFLAGS_INCLUDE}") -ENDIF (GFLAGS) - -# Google Logging -MESSAGE("-- Check for Google Log") -FIND_LIBRARY(GLOG_LIB NAMES glog PATHS ${SEARCH_LIBS}) -IF (NOT EXISTS ${GLOG_LIB}) - MESSAGE(FATAL_ERROR - "Can't find Google Log. Please specify: " - "-DGLOG_LIB=...") -ENDIF (NOT EXISTS ${GLOG_LIB}) -MESSAGE("-- Found Google Log library: ${GLOG_LIB}") - -FIND_PATH(GLOG_INCLUDE NAMES glog/logging.h PATHS ${SEARCH_HEADERS}) -IF (NOT EXISTS ${GLOG_INCLUDE}) - MESSAGE(FATAL_ERROR - "Can't find Google Log. Please specify: " - "-DGLOG_INCLUDE=...") -ENDIF (NOT EXISTS ${GLOG_INCLUDE}) -MESSAGE("-- Found Google Log header in: ${GLOG_INCLUDE}") - -# Eigen -MESSAGE("-- Check for Eigen 3.x") -FIND_PATH(EIGEN_INCLUDE NAMES Eigen/Core PATHS ${EIGEN_SEARCH_HEADERS}) -IF (NOT EXISTS ${EIGEN_INCLUDE}) - MESSAGE(FATAL_ERROR "Can't find Eigen. Try passing -DEIGEN_INCLUDE=...") -ENDIF (NOT EXISTS ${EIGEN_INCLUDE}) -MESSAGE("-- Found Eigen 3.x: ${EIGEN_INCLUDE}") - - -INCLUDE_DIRECTORIES( - ${GLOG_INCLUDE} - ${EIGEN_INCLUDE} - ) |