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/gui | |
| 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/gui')
| -rw-r--r-- | examples/gui/analogclock/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/gui/openglwindow/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/gui/rasterwindow/CMakeLists.txt | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/examples/gui/analogclock/CMakeLists.txt b/examples/gui/analogclock/CMakeLists.txt index 7fe1aed8de..8d2d51a97f 100644 --- a/examples/gui/analogclock/CMakeLists.txt +++ b/examples/gui/analogclock/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_qt_gui_executable(gui_analogclock WIN32 MACOSX_BUNDLE # special case: renamed target +add_qt_gui_executable(gui_analogclock # special case: renamed target ../rasterwindow/rasterwindow.cpp ../rasterwindow/rasterwindow.h main.cpp ) @@ -29,4 +29,5 @@ target_link_libraries(gui_analogclock PUBLIC install(TARGETS gui_analogclock RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/gui/openglwindow/CMakeLists.txt b/examples/gui/openglwindow/CMakeLists.txt index c77dabd0c1..cde169deb5 100644 --- a/examples/gui/openglwindow/CMakeLists.txt +++ b/examples/gui/openglwindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_qt_gui_executable(openglwindow WIN32 MACOSX_BUNDLE +add_qt_gui_executable(openglwindow main.cpp openglwindow.cpp openglwindow.h ) @@ -28,4 +28,5 @@ target_link_libraries(openglwindow PUBLIC install(TARGETS openglwindow RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/gui/rasterwindow/CMakeLists.txt b/examples/gui/rasterwindow/CMakeLists.txt index 9ddf916369..eab79cee2f 100644 --- a/examples/gui/rasterwindow/CMakeLists.txt +++ b/examples/gui/rasterwindow/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_AUTOUIC ON) set(INSTALL_EXAMPLEDIR "examples") -add_qt_gui_executable(rasterwindow WIN32 MACOSX_BUNDLE +add_qt_gui_executable(rasterwindow main.cpp rasterwindow.cpp rasterwindow.h ) @@ -28,4 +28,5 @@ target_link_libraries(rasterwindow PUBLIC install(TARGETS rasterwindow RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) |