replace qtappfw with qtappfw-navigation package 22/24622/2
authorRaquel Medina <raquel.medina@konsulko.com>
Tue, 2 Jun 2020 14:48:07 +0000 (16:48 +0200)
committerRaquel Medina <raquel.medina@konsulko.com>
Mon, 8 Jun 2020 17:30:26 +0000 (19:30 +0200)
Bug-AGL: SPEC-3390
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I49bbbba3bd2a57401c6484374d6af255fd6b463f

CMakeLists.txt

index dd6be29..9af2455 100644 (file)
@@ -25,20 +25,20 @@ pkg_check_modules(QT5_CORE REQUIRED Qt5Core)
 pkg_check_modules(JSON REQUIRED json-c)
 pkg_check_modules(QT5_WIDGETS REQUIRED Qt5Widgets)
 pkg_check_modules(QT5_NETWORK REQUIRED Qt5Network)
-pkg_check_modules(QTAPPFW REQUIRED qtappfw)
+pkg_check_modules(LIBQTAPPFW REQUIRED qtappfw-navigation)
 pkg_check_modules(QLIBWIN REQUIRED qlibwindowmanager)
 pkg_check_modules(LIBHS REQUIRED libhomescreen)
 
 
 
-include_directories( ${PROJECT_SOURCE_DIR}/ ${QTAPPFW_INCLUDE_DIRS} ${QT5_CORE_INCLUDE_DIRS} ${QT5_WIDGETS_INCLUDE_DIRS} ${QT5_NETWORK_INCLUDE_DIRS} ${JSON_INCLUDE_DIRS} ${QLIBWIN_INCLUDE_DIRS} ${LIBHS_INCLUDE_DIRS} )
+include_directories( ${PROJECT_SOURCE_DIR}/ ${LIBQTAPPFW_INCLUDE_DIRS} ${QT5_CORE_INCLUDE_DIRS} ${QT5_WIDGETS_INCLUDE_DIRS} ${QT5_NETWORK_INCLUDE_DIRS} ${JSON_INCLUDE_DIRS} ${QLIBWIN_INCLUDE_DIRS} ${LIBHS_INCLUDE_DIRS} )
 
 qt5_wrap_cpp(yelp_client_SRC MainApp.h InfoPanelLabel.h ClickableLabel.h Keyboard.h)
 
 QT5_ADD_RESOURCES(yelp_client_QRC yelp-client.qrc)
 add_executable( yelp-client main.cpp MainApp.cpp InfoPanel.cpp InfoPanelLabel.cpp Keyboard.cpp yelp-client.qrc ${yelp_client_SRC} ${yelp_client_QRC})
 #target_link_libraries( yelp-client binderclient )
-target_link_libraries( yelp-client ${QTAPPFW_LIBRARIES} ${JSON_LIBRARIES} ${QLIBWIN_LIBRARIES} ${LIBHS_LIBRARIES} )
+target_link_libraries( yelp-client ${LIBQTAPPFW_LIBRARIES} ${JSON_LIBRARIES} ${QLIBWIN_LIBRARIES} ${LIBHS_LIBRARIES} )
 qt5_use_modules(yelp-client Core Widgets Network)
 
 install (TARGETS yelp-client DESTINATION bin)