diff --git a/README.md b/README.md index 055577da..afdde6ad 100644 --- a/README.md +++ b/README.md @@ -145,7 +145,6 @@ Now that texturing is in the code base, you can access the full textured meshes --- Long term, the aim is for the toolchain to also be able to optionally push to a variety of online data repositories, pushing hi-resolution aerials to [OpenAerialMap](http://opentopography.org/), point clouds to [OpenTopography](http://opentopography.org/), and pushing digital elevation models to an emerging global repository (yet to be named...). That leaves only digital surface model meshes and UV textured meshes with no global repository home. - --- diff --git a/modules/odm_extract_utm/CMakeLists.txt b/modules/odm_extract_utm/CMakeLists.txt index 42cbb049..51e14b64 100644 --- a/modules/odm_extract_utm/CMakeLists.txt +++ b/modules/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/modules/odm_georef/CMakeLists.txt b/modules/odm_georef/CMakeLists.txt index 2117f20b..9892a37e 100644 --- a/modules/odm_georef/CMakeLists.txt +++ b/modules/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)