mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use a single variable to handle the extra Qt stuff

Browse source 
It's easier to debug what's wrong this way

Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
This commit is contained in:
Tomaz Canabrava 2015-11-20 11:49:56 -02:00 • committed by Dirk Hohndel
parent 24f0abe347
commit aaafaade5e
3 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
CMakeLists.txt
View file

@ -111,24 +111,23 @@ if(ANDROID)
set(NO_PRINTING ON) set(NO_PRINTING ON)
endif() endif()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES})
# configure Qt. # configure Qt.
if(SUBSURFACE_MOBILE) if(SUBSURFACE_MOBILE)
set(QT_QUICK_PKG Quick) list(APPEND QT_EXTRA_COMPONENTS Quick)
set(QT_QUICK_LIB Qt5::Quick) list(APPEND QT_EXTRA_LIBRARIES Qt5::Quick)
add_definitions(-DSUBSURFACE_MOBILE) add_definitions(-DSUBSURFACE_MOBILE)
endif() endif()
if(ANDROID) if(ANDROID)
set(ANDROID_PKG AndroidExtras) list(APPEND QT_EXTRA_COMPONENTS AndroidExtras)
set(ANDROID_LIB Qt5::AndroidExtras) list(APPEND QT_EXTRA_LIBRARIES Qt5::AndroidExtras)
endif() endif()
if(BTSUPPORT) if(BTSUPPORT)
set(BLUETOOTH_PKG Bluetooth) list(APPEND QT_EXTRA_COMPONENTS Bluetooth)
set(BLUETOOTH_LIB Qt5::Bluetooth) list(APPEND QT_EXTRA_LIBRARIES Qt5::Bluetooth)
endif() endif()
find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network ${WEBKIT_PKG} ${PRINTING_PKG} Svg Test LinguistTools ${QT_QUICK_PKG} ${ANDROID_PKG} Bluetooth Location)
set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network ${WEBKIT_LIB} ${PRINTING_LIB} Qt5::Svg ${QT_QUICK_LIB} ${ANDROID_LIB} Qt5::Bluetooth Qt5::Positioning) find_package(Qt5 REQUIRED COMPONENTS Core Concurrent Widgets Network Svg Test LinguistTools OOLCHAIN_LOCATION ${QT_EXTRA_COMPONENTS})
set(QT_LIBRARIES Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network Qt5::Svg Qt5::Positioning ${QT_EXTRA_LIBRARIES})
set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test) set(QT_TEST_LIBRARIES ${QT_LIBRARIES} Qt5::Test)
if (BTSUPPORT AND "${Qt5Core_VERSION_STRING}" STRLESS "5.4.0") if (BTSUPPORT AND "${Qt5Core_VERSION_STRING}" STRLESS "5.4.0")
@ -141,6 +140,8 @@ if(BTSUPPORT)
add_definitions(-DBT_SUPPORT) add_definitions(-DBT_SUPPORT)
endif() endif()
set(SUBSURFACE_LINK_LIBRARIES ${SUBSURFACE_LINK_LIBRARIES} ${LIBDIVECOMPUTER_LIBRARIES} ${LIBGIT2_LIBRARIES} ${LIBUSB_LIBRARIES})
# set up the different target platforms # set up the different target platforms
if(CMAKE_SYSTEM_NAME STREQUAL "Linux") if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
set(SUBSURFACE_TARGET subsurface) set(SUBSURFACE_TARGET subsurface)

4
cmake/Modules/HandleFindGrantlee.cmake
View file

@ -10,6 +10,6 @@ else()
find_package(Grantlee5 REQUIRED) find_package(Grantlee5 REQUIRED)
set(GRANTLEE_LIBRARIES Grantlee5::Templates) set(GRANTLEE_LIBRARIES Grantlee5::Templates)
endif() endif()
set(PRINTING_PKG PrintSupport) LIST(APPEND QT_EXTRA_COMPONENTS PrintSupport)
set(PRINTING_LIB Qt5::PrintSupport) LIST(APPEND QT_EXTRA_LIBRARIES Qt5::PrintSupport)
endif() endif()

4
cmake/Modules/HandleUserManual.cmake
View file

@ -2,6 +2,6 @@ if(NO_USERMANUAL)
message(STATUS "building without usermanual") message(STATUS "building without usermanual")
add_definitions(-DNO_USERMANUAL) add_definitions(-DNO_USERMANUAL)
else() else()
set(WEBKIT_PKG WebKitWidgets) list(APPEND QT_EXTRA_COMPONENTS WebKitWidgets)
set(WEBKIT_LIB Qt5::WebKitWidgets) list(APPEND QT_EXTRA_LIBRARIES Qt5::WebKitWidgets)
endif() endif()