diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2016-08-18 21:38:13 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2016-08-18 21:38:13 -0700 |
| commit | 7dd8a62ceddbb2205bd41260964f3450e72fccab (patch) | |
| tree | 62c3c06cbe1bf3a5ae37122f55a273e4fa741c0b /CMakeLists.txt | |
| parent | 11df8d9a906d0c75ffe598b1a88e51fe7db94209 (diff) | |
| download | subsurface-7dd8a62ceddbb2205bd41260964f3450e72fccab.tar.gz | |
Don't build Kirigami as a library
Just link it directly into Subsurface-mobile. That's what we already do
with the qmake file for iOS, now the cmake based builds do the same. This
should remove a lot of issues.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a824d0364..8efd34b2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -228,26 +228,26 @@ if(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "MobileExecutable") set(MOBILE_SRC mobile-widgets/qmlmanager.cpp mobile-widgets/qmlprofile.cpp + mobile-widgets/qml/kirigami/src/kirigamiplugin.cpp + mobile-widgets/qml/kirigami/src/enums.cpp subsurface-mobile-main.cpp subsurface-mobile-helper.cpp ) + add_definitions(-DKIRIGAMI_BUILD_TYPE_STATIC) qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/mobile-resources.qrc) + qt5_add_resources(MOBILE_RESOURCES mobile-widgets/qml/kirigami/kirigami.qrc) # When building the mobile application in Android, link it and Qt will do the rest, when doing the mobile application on Desktop, create an executable. if(ANDROID) add_library(${SUBSURFACE_TARGET} SHARED ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) else() add_executable(${SUBSURFACE_TARGET} MACOSX_BUNDLE WIN32 ${SUBSURFACE_PKG} ${MOBILE_SRC} ${SUBSURFACE_RESOURCES} ${MOBILE_RESOURCES}) endif() - ADD_LIBRARY(kirigami_static_library STATIC IMPORTED) - SET_TARGET_PROPERTIES(kirigami_static_library PROPERTIES - IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../kirigami-build/src/libkirigamiplugin.a) target_link_libraries( ${SUBSURFACE_TARGET} subsurface_profile subsurface_models subsurface_corelib ${SUBSURFACE_LINK_LIBRARIES} - kirigami_static_library ) elseif(${SUBSURFACE_TARGET_EXECUTABLE} MATCHES "DesktopExecutable") set(SUBSURFACE_APP |