diff options
| author |  Tomaz Canabrava <tomaz.canabrava@intel.com> | 2015-04-07 17:19:14 -0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-04-07 16:07:14 -0700 |
| commit | f13e72c306a4cd0728c4f64b09f13f1b4f462557 (patch) | |
| tree | 31ff1f6aba11b4d4efd6f7b3dc099a5bf356603e | |
| parent | 057231701e68b5546c7ce373286b7999c93f3b04 (diff) | |
| download | subsurface-f13e72c306a4cd0728c4f64b09f13f1b4f462557.tar.gz | |
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 <tomaz.canabrava@intel.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | cmake/Modules/FindMarble.cmake | 23 |
1 files changed, 20 insertions, 3 deletions
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 ) |