diff options
author | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-12 10:21:40 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2019-06-12 14:19:53 +0000 |
commit | efa9998521cb061051fe8b75d0df3206d0b32ec5 (patch) | |
tree | 814ad216d5360cea3397a22ed1d649821d76fb17 /examples/dbus/remotecontrolledcar | |
parent | 6732fa3a291e77acad3ab6ba829d1026462dc139 (diff) |
Fix compiling of examples on Android
* Simplify add_qt_gui_executable() to not require WIN32/MACOSX_BUNDLE
but provide it implicitly. It's redundant :)
* When on Android, build a module (shared library), just like qmake.
This requires an additional library destination in the install() call,
but that's ignored on other platforms.
* Fix typos in the android deployment generation settings function
* Use the correct cache variable to determine whether we're inside a Qt
build or not. Right now this only works inside Qt builds anyway as
QtPlatformAndroid.cmake is not publically accessible.
Change-Id: If1c763c31a7a83d0e0d854362ba7901657f63eb5
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'examples/dbus/remotecontrolledcar')
-rw-r--r-- | examples/dbus/remotecontrolledcar/car/CMakeLists.txt | 3 | ||||
-rw-r--r-- | examples/dbus/remotecontrolledcar/controller/CMakeLists.txt | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt index cee3b2bb50..18af20fe38 100644 --- a/examples/dbus/remotecontrolledcar/car/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/car/CMakeLists.txt @@ -23,7 +23,7 @@ qt5_add_dbus_adaptor(car_SRCS car_adaptor ) # special case end -add_qt_gui_executable(car WIN32 MACOSX_BUNDLE +add_qt_gui_executable(car car.cpp car.h main.cpp ${car_SRCS} # special case @@ -35,4 +35,5 @@ target_link_libraries(car PUBLIC install(TARGETS car RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt index ee97e0d1e4..06a975db7e 100644 --- a/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt +++ b/examples/dbus/remotecontrolledcar/controller/CMakeLists.txt @@ -21,7 +21,7 @@ qt5_add_dbus_interface(controller_SRCS car_interface ) # special case end -add_qt_gui_executable(controller WIN32 MACOSX_BUNDLE +add_qt_gui_executable(controller controller.cpp controller.h controller.ui main.cpp ${controller_SRCS} # special case @@ -33,4 +33,5 @@ target_link_libraries(controller PUBLIC install(TARGETS controller RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) |