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/qtconcurrent | |
| 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/qtconcurrent')
| -rw-r--r-- | examples/qtconcurrent/imagescaling/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/qtconcurrent/map/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | examples/qtconcurrent/progressdialog/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | examples/qtconcurrent/runfunction/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | examples/qtconcurrent/wordcount/CMakeLists.txt | 1 |
5 files changed, 6 insertions, 1 deletions
diff --git a/examples/qtconcurrent/imagescaling/CMakeLists.txt b/examples/qtconcurrent/imagescaling/CMakeLists.txt index 448bcf848e..f75291cabd 100644 --- a/examples/qtconcurrent/imagescaling/CMakeLists.txt +++ b/examples/qtconcurrent/imagescaling/CMakeLists.txt @@ -14,7 +14,7 @@ set(INSTALL_EXAMPLEDIR "examples") find_package(Qt5 COMPONENTS Concurrent) find_package(Qt5 COMPONENTS Widgets) -add_qt_gui_executable(imagescaling WIN32 MACOSX_BUNDLE +add_qt_gui_executable(imagescaling imagescaling.cpp imagescaling.h main.cpp ) @@ -26,4 +26,5 @@ target_link_libraries(imagescaling PUBLIC install(TARGETS imagescaling RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/qtconcurrent/map/CMakeLists.txt b/examples/qtconcurrent/map/CMakeLists.txt index a5bac9a973..f6d7253847 100644 --- a/examples/qtconcurrent/map/CMakeLists.txt +++ b/examples/qtconcurrent/map/CMakeLists.txt @@ -24,4 +24,5 @@ target_link_libraries(mapdemo PUBLIC install(TARGETS mapdemo RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/qtconcurrent/progressdialog/CMakeLists.txt b/examples/qtconcurrent/progressdialog/CMakeLists.txt index 8a61fd0e0a..0eff435ed2 100644 --- a/examples/qtconcurrent/progressdialog/CMakeLists.txt +++ b/examples/qtconcurrent/progressdialog/CMakeLists.txt @@ -25,4 +25,5 @@ target_link_libraries(progressdialog PUBLIC install(TARGETS progressdialog RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/qtconcurrent/runfunction/CMakeLists.txt b/examples/qtconcurrent/runfunction/CMakeLists.txt index f71a789423..95f53e8637 100644 --- a/examples/qtconcurrent/runfunction/CMakeLists.txt +++ b/examples/qtconcurrent/runfunction/CMakeLists.txt @@ -25,4 +25,5 @@ target_link_libraries(runfunction PUBLIC install(TARGETS runfunction RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) diff --git a/examples/qtconcurrent/wordcount/CMakeLists.txt b/examples/qtconcurrent/wordcount/CMakeLists.txt index 4c6402102d..8e79f716c6 100644 --- a/examples/qtconcurrent/wordcount/CMakeLists.txt +++ b/examples/qtconcurrent/wordcount/CMakeLists.txt @@ -25,4 +25,5 @@ target_link_libraries(wordcount PUBLIC install(TARGETS wordcount RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" + LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" ) |