mirror
/
OpenDroneMap-ODM
kopia lustrzana https://github.com/OpenDroneMap/ODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge pull request #12 from dakotabenjamin/cmake 

Move install of GFlags above Ceres

Former-commit-id: 8e30e578a7
pull/1161/head
Edgar Riba 2015-12-16 10:26:44 +01:00
rodzic 758f55150f 73a0d81277
commit 5a4a537a32
1 zmienionych plików z 11 dodań i 10 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

19
SuperBuild/CMakeLists.txt
Wyświetl plik

@ -70,15 +70,6 @@ option(ODM_BUILD_PCL "Force to build PCL library" OFF)
SETUP_EXTERNAL_PROJECT(PCL ${ODM_PCL_Version} ${ODM_BUILD_PCL}) SETUP_EXTERNAL_PROJECT(PCL ${ODM_PCL_Version} ${ODM_BUILD_PCL})
# ---------------------------------------------------------------------------------------------
# Ceres Solver
#
set(ODM_Ceres_Version 1.10.0)
option(ODM_BUILD_Ceres "Force to build Ceres library" OFF)
SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
# --------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------
# Google Flags library (GFlags) # Google Flags library (GFlags)
# #
@ -88,6 +79,15 @@ option(ODM_BUILD_GFlags "Force to build GFlags library" OFF)
SETUP_EXTERNAL_PROJECT(GFlags ${ODM_GFlags_Version} ${ODM_BUILD_GFlags}) SETUP_EXTERNAL_PROJECT(GFlags ${ODM_GFlags_Version} ${ODM_BUILD_GFlags})
# ---------------------------------------------------------------------------------------------
# Ceres Solver
#
set(ODM_Ceres_Version 1.10.0)
option(ODM_BUILD_Ceres "Force to build Ceres library" OFF)
SETUP_EXTERNAL_PROJECT(Ceres ${ODM_Ceres_Version} ${ODM_BUILD_Ceres})
# --------------------------------------------------------------------------------------------- # ---------------------------------------------------------------------------------------------
# Open Geometric Vision (OpenGV) # Open Geometric Vision (OpenGV)
# Open Structure from Motion (OpenSfM) # Open Structure from Motion (OpenSfM)
@ -107,3 +107,4 @@ set(custom_libs OpenGV
foreach(lib ${custom_libs}) foreach(lib ${custom_libs})
SETUP_EXTERNAL_PROJECT_CUSTOM(${lib}) SETUP_EXTERNAL_PROJECT_CUSTOM(${lib})
endforeach() endforeach()