From f13e72c306a4cd0728c4f64b09f13f1b4f462557 Mon Sep 17 00:00:00 2001 From: Tomaz Canabrava Date: Tue, 7 Apr 2015 17:19:14 -0300 Subject: Search for Marble in the default build folder Now we search for Marble in the default build folder, too, which is CMAKE_CURRENT_SOURCE_DIR/.. Also look for both regular Marble and for our Subsurface branch of Marble (which uses a different library name). Signed-off-by: Tomaz Canabrava Signed-off-by: Dirk Hohndel --- cmake/Modules/FindMarble.cmake | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) (limited to 'cmake/Modules/FindMarble.cmake') diff --git a/cmake/Modules/FindMarble.cmake b/cmake/Modules/FindMarble.cmake index 4917c995e..aed73ffac 100644 --- a/cmake/Modules/FindMarble.cmake +++ b/cmake/Modules/FindMarble.cmake @@ -8,13 +8,30 @@ # For details see the accompanying COPYING-CMAKE-SCRIPTS file. # +# in cache already IF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES ) - # in cache already SET( MARBLE_FIND_QUIETLY TRUE ) ENDIF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES ) -FIND_PATH( MARBLE_INCLUDE_DIR NAMES marble/MarbleModel.h ) -FIND_LIBRARY( MARBLE_LIBRARIES NAMES marblewidget ) +FIND_PATH( MARBLE_INCLUDE_DIR +NAMES marble/MarbleModel.h +HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../marble/src/lib + ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source/src/lib + /usr/local/include + /usr/include +) + +FIND_LIBRARY( MARBLE_LIBRARIES +NAMES + ssrfmarblewidget + marblewidget +HINTS + ${CMAKE_CURRENT_SOURCE_DIR}/../marble + ${CMAKE_CURRENT_SOURCE_DIR}/../marble-source + /usr/local/include + /usr/include +) INCLUDE( FindPackageHandleStandardArgs ) FIND_PACKAGE_HANDLE_STANDARD_ARGS( marble DEFAULT_MSG MARBLE_INCLUDE_DIR MARBLE_LIBRARIES ) -- cgit v1.2.3-70-g09d2