diff --git a/install.sh b/install.sh index aff8d2e2..0fee8469 100755 --- a/install.sh +++ b/install.sh @@ -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\ diff --git a/odm_extract_utm/CMakeLists.txt b/odm_extract_utm/CMakeLists.txt index 42cbb049..51e14b64 100644 --- a/odm_extract_utm/CMakeLists.txt +++ b/odm_extract_utm/CMakeLists.txt @@ -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) diff --git a/odm_georef/CMakeLists.txt b/odm_georef/CMakeLists.txt index 2117f20b..9892a37e 100644 --- a/odm_georef/CMakeLists.txt +++ b/odm_georef/CMakeLists.txt @@ -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)