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

Make install cross compatible with Xenial and Trusty (#299) 

Former-commit-id: c764f49121
gh-pages
Dakota Benjamin 2016-05-13 09:23:52 -04:00
rodzic f533fd995e
commit 68139e7e69
3 zmienionych plików z 6 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
install.sh
Wyświetl plik

@ -115,7 +115,7 @@ echo " - installing"
if [[ `lsb_release -rs` == "12.04" ]];
then
sudo apt-get install --assume-yes --install-recommends \
build-essential cmake g++ gcc gFortran perl git autoconf \
build-essential cmake g++ gcc gfortran perl git autoconf \
curl wget \
unzip \
imagemagick jhead proj-bin libproj-dev\
@ -130,7 +130,7 @@ sudo apt-get install --assume-yes --install-recommends \
> "$TOOLS_LOG_PATH/apt-get_install.log" 2>&1
else
sudo apt-get install --assume-yes --install-recommends \
build-essential cmake g++ gcc gFortran perl git autoconf \
build-essential cmake g++ gcc gfortran perl git autoconf \
curl wget \
unzip \
imagemagick jhead proj-bin libproj-dev\

3
odm_extract_utm/CMakeLists.txt
Wyświetl plik

@ -2,7 +2,8 @@ project(odm_extract_utm)
cmake_minimum_required(VERSION 2.8)
set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
set(PROJ4_LIBRARY "/usr/lib/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
# Add compiler options.
add_definitions(-Wall -Wextra)

3
odm_georef/CMakeLists.txt
Wyświetl plik

@ -5,7 +5,8 @@ cmake_minimum_required(VERSION 2.8)
set(PCL_DIR "PCL_DIR-NOTFOUND" CACHE "PCL_DIR" "Path to the pcl installation directory")
set(OPENCV_DIR "OPENCV_DIR-NOTFOUND" CACHE "OPENCV_DIR" "Path to the opencv installation directory")
set(PROJ4_INCLUDE_DIR "/usr/include/" CACHE "PROJ4_INCLUDE_DIR" "Path to the proj4 inlcude directory")
set(PROJ4_LIBRARY "/usr/lib/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
find_library(PROJ4_LIBRARY "libproj.so" PATHS "/usr/lib" "/usr/lib/x86_64-linux-gnu")
#set(PROJ4_LIBRARY "/usr/lib/x86_64-linux-gnu/libproj.so" CACHE "PROJ4_LIBRARY" "Path to the proj4 library directory")
# Add compiler options.
add_definitions(-Wall -Wextra -Wconversion -pedantic)