From 2e05dbb791740d308c2479562ce13de4087e62d1 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 7 Apr 2015 17:20:27 -0300 Subject: No need to specify Marble dir anymore We are already looking for the default directory. *if* cmake doesn't find Marble automatically, the user needs to specify -DMARBLE_INCLUDE_DIR and -DMARBLE_LIBRARIES Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- CMakeLists.txt | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ba2d3381..4b434f570 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,15 +53,8 @@ ELSE() set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} -ldivecomputer) ENDIF() -IF(NOT DEFINED LIBMARBLEDEVEL) - FIND_PACKAGE(Marble REQUIRED) - include_directories(${MARBLE_INCLUDE_DIR}) - link_directories(${MARBLE_LIB_DIR}) -ELSE() - include_directories(${LIBMARBLEDEVEL}/include) - link_directories(${LIBMARBLEDEVEL}/lib) - SET(MARBLE_LIBRARIES -L${LIBMARBLEDEVEL}/lib -lssrfmarblewidget) -ENDIF() +FIND_PACKAGE(Marble REQUIRED) +include_directories(${MARBLE_INCLUDE_DIR}) # handle out of tree build correctly -- cgit v1.2.3-70-g09d2