[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [libkgeomap/frameworks] cmake: Adjust to the latest changes in Marble when build against Qt5 and adj
From:       Raymond Wooninck <tittiatcoke () gmail ! com>
Date:       2015-04-26 19:19:54
Message-ID: E1YmS5q-000758-UU () scm ! kde ! org
[Download RAW message or body]

Git commit 3aa75c8e3b93670706dbb8f0368058f8b5757f8f by Raymond Wooninck.
Committed on 26/04/2015 at 19:19.
Pushed by rwooninck into branch 'frameworks'.

Adjust to the latest changes in Marble when build against Qt5 and adjust th=
e find_dependency calls

M  +1    -1    cmake/modules/FindMarble.cmake
M  +9    -2    cmake/templates/KF5KGeoMapConfig.cmake.in

http://commits.kde.org/libkgeomap/3aa75c8e3b93670706dbb8f0368058f8b5757f8f

diff --git a/cmake/modules/FindMarble.cmake b/cmake/modules/FindMarble.cmake
index 99f017a..6c10a91 100644
--- a/cmake/modules/FindMarble.cmake
+++ b/cmake/modules/FindMarble.cmake
@@ -14,7 +14,7 @@ IF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
 ENDIF ( MARBLE_INCLUDE_DIR AND MARBLE_LIBRARIES )
 =

 FIND_PATH( MARBLE_INCLUDE_DIR NAMES marble/MarbleModel.h )
-FIND_LIBRARY( MARBLE_LIBRARIES NAMES marblewidget )
+FIND_LIBRARY( MARBLE_LIBRARIES NAMES marblewidget-qt5 )
 =

 INCLUDE( FindPackageHandleStandardArgs )
 FIND_PACKAGE_HANDLE_STANDARD_ARGS( marble DEFAULT_MSG MARBLE_INCLUDE_DIR M=
ARBLE_LIBRARIES )
diff --git a/cmake/templates/KF5KGeoMapConfig.cmake.in b/cmake/templates/KF=
5KGeoMapConfig.cmake.in
index 359fb95..9801716 100644
--- a/cmake/templates/KF5KGeoMapConfig.cmake.in
+++ b/cmake/templates/KF5KGeoMapConfig.cmake.in
@@ -13,7 +13,14 @@
 =

 @PACKAGE_INIT@
 =

-find_dependency(Qt5Core Qt5WebKitWidgets Qt5Widgets Qt5Gui Qt5Xml Qt5Concu=
rrent @REQUIRED_QT_VERSION@)
-find_dependency(KF5I18n KF5Config KF5KIO)
+find_dependency(Qt5Core @REQUIRED_QT_VERSION@)
+find_dependency(Qt5WebKitWidgets @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Gui @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Xml @REQUIRED_QT_VERSION@)
+find_dependency(Qt5Concurrent @REQUIRED_QT_VERSION@)
+find_dependency(KF5I18n)
+find_dependency(KF5Config)
+find_dependency(F5Config)
 =

 include("${CMAKE_CURRENT_LIST_DIR}/KF5KGeoMapTargets.cmake")
[prev in list] [next in list] [prev in thread] [next in thread]