summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* cmake: Make it so that eglfs plugin doesn't hang on make -jNAlbert Astals Cid2019-02-271-0/+1
| | | | | | | | | | | | | | | Since the dependency on moc is in CorePrivate (o Core) we need the target to depend on it otherwise cmake will try to use moc before it is built. This is because what we do with cmake is say "moc is in this path, you can use it", but it's actually not built yet so we need to depend on a target that depends on moc directly otherwise cmake will trust us and try to use a cmake that doesn't exist and just hang forever when running make -jN Change-Id: Icf55c62092fd3fd3754a4f4f28c8c313bf374615 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Give the egl_x11 test the necessary libs to compileAlbert Astals Cid2019-02-274-7/+49
| | | | | | | | | | | And add the eglfs_x11 plugin We need to actually try to compile the test as the comment it it says that having x11 and egl is not enough since sometimes they are actually incompatible Change-Id: If6bdc08c21b91fa9c41663f2fa653fd59e5ddd2e Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* pro2cmake: account for child .pro files having includesAlbert Astals Cid2019-02-271-1/+2
| | | | | Change-Id: Ic2213578c9bd27787ae9788acbe4455252a1158c Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* cmake: Start adding compiler flagsAlbert Astals Cid2019-02-213-0/+10
| | | | | | | | | Only has warnings for now Next to come is the support for developer-build and enabling Werror Change-Id: I8070dc06eb439c2a03007cce975c8147ff7e1582 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: set a CMAKE_BUILD_TYPE if none was specifiedAlbert Astals Cid2019-02-211-0/+12
| | | | | | | Because the default "empty" CMAKE_BUILD_TYPE is a weird default Change-Id: I5768f67aa85dce4108e421d2f4eacdfb1cb5beb0 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: fix a syntax for elseLiang Qi2019-02-211-1/+1
| | | | | | | | This amends d885226544c. Change-Id: Ia7b2fb6e0e762c73d3c0775cdd106c1dec646ab2 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix ELF interpreter detectionSimon Hausmann2019-02-201-6/+16
| | | | | | | | | | | | Use the same approach as with qmake, by using readelf -l /bin/ls and then a regular expression to extract the program interpreter path. It's a little simpler in cmake because we can avoid the perl dance and quotes and just use cmake's built-in regular expression matching. This change also excludes static builds, as with qmake. Change-Id: I699e166c4b38b3fe98e6390316206109ad6363f9 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Update FindEGL.cmake from upstreamSimon Hausmann2019-02-201-4/+2
| | | | | | | | Upstream commit 7c64db9568296e1caafcfd7163cea3ab1b1626ae fixed the suffix path checking and thus the build on FreeBSD. Change-Id: I0cceeac0639c2899c617ffd6359098d2154acf5b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Add support for building conveniently with ccacheSimon Hausmann2019-02-191-0/+8
| | | | | | | | | Pass -DQT_USE_CCACHE=ON to enable the use of ccache. This avoids having to set up symlinks, which is useful when cross-compiling against different targets. Change-Id: I023fff105baaa538730997948aa122d2678887ce Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Fix use of uic when cross-compilingSimon Hausmann2019-02-192-23/+20
| | | | | | | | Don't try to build uic but instead import it. This is done centrally now in add_qt_tool. Change-Id: I241fbb924de68549e9c0320e157351bd7b1bf5c3 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Provide some basic instructions for cross-compiling and using CCacheSimon Hausmann2019-02-191-0/+24
| | | | | Change-Id: I8bb90746d0cef2ea61a5494ef358713d732dcfce Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Fix source file name on AndroidSimon Hausmann2019-02-181-1/+1
| | | | | Change-Id: I0814cb02ef7205bb5d197ea0e5cc7e26a8bc15eb Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Skip the qmake build when cross-compilingSimon Hausmann2019-02-181-1/+3
| | | | | Change-Id: I24da7eb9587235aa937a984e91a833284b4f28e5 Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: build eglfs_emuAlbert Astals Cid2019-02-182-1/+27
| | | | | Change-Id: I793865f55114d08c342477f4e786d1089239ace4 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build eglfs_kms_egldeviceAlbert Astals Cid2019-02-182-1/+35
| | | | | Change-Id: Ib224140d64efdc9c7190add7b568484313ecd7a3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build eglfs_kms pluginAlbert Astals Cid2019-02-182-1/+39
| | | | | Change-Id: I362c17a67c2cb4c243c39f760c598bfc7e1071bd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: build eglfs_kms_supportAlbert Astals Cid2019-02-182-1/+30
| | | | | Change-Id: I0c1cca14756519f60f71143150e56380fa3a6289 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: add more mappings to helper.pyAlbert Astals Cid2019-02-181-0/+3
| | | | | Change-Id: Ie5096c1fe74105db84ccd60655a20d389a887b14 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: add deviceintegration/CMakeLists.txtAlbert Astals Cid2019-02-182-1/+51
| | | | | Change-Id: I2b30c27bb4f17f40143a66e89b3d5986375a76a6 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* pro2cmake: Target dependencies can be on -private libsAlbert Astals Cid2019-02-181-1/+1
| | | | | | | so use map_qt_library instead of map_qt_base_library Change-Id: I4dd0097fff3ffd9ec4aad36d11d79ea23a08cb90 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Add the eglfs platform pluginAlbert Astals Cid2019-02-152-1/+108
| | | | | Change-Id: I1caef781db690a3c25e871947c11175cde5cc97b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: helper.py more mappingsAlbert Astals Cid2019-02-151-0/+3
| | | | | Change-Id: I69a1715bbda8f5ddfb367e7c7c693e4ec412f5c3 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Compile qobject.cpp with same flags as CoreKevin Funk2019-02-151-8/+6
| | | | | | | | Makes sure qobject.cpp.o also sees -DQT_BUILD_CORE_LIB Change-Id: I2aaf1cec62eeab07bbec6e4135bbe144d4ae7fba Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: printsupport depends on core, gui and widgetsLiang Qi2019-02-141-1/+3
| | | | | Change-Id: Ifd1f8c23eca3daa788f814b450ad326f6415212f Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: Make sure to finddeps of private targetKevin Funk2019-02-141-30/+33
| | | | | | | | | | | Public interface libraries of the private target need to be first looked up via `find_dependency(...)` in the CMake config files as well. This patch is just changing the foreach() loop and defer the package config file generation. Change-Id: Iecaf7f778379b526f12ac6a42e76d714d9349b2c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Make sure QT_SYNCQT is persistedKevin Funk2019-02-141-7/+9
| | | | | | | | Lifetime of the variable is bound to the function body. Use a CACHE variable to escape it (and to speed up future calls to the function). Change-Id: I2d164a1c94e64cc652e65c1eea0522f3d911ad82 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Make sure QtModuleConfig.cmake.in is foundKevin Funk2019-02-141-1/+2
| | | | | | | ... when QtBuild.cmake is being included from another Qt module Change-Id: Ia55e03422cc84a56dd9eac640621e5b2ee9681bd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Install all necessary .cmake filesKevin Funk2019-02-141-0/+6
| | | | | | | ... for other modules Change-Id: Iea184036a46816e524de247e1d650ae417de294c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Minor fix in QtModuleConfig.cmake.inKevin Funk2019-02-141-1/+1
| | | | | Change-Id: Ia01e935582b5291fa8ed6bf46866fbb74d41f4b0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Also use -Wl,--no-undefined for ClangKevin Funk2019-02-131-2/+2
| | | | | Change-Id: Ida6bf41e496a0e800f1146d15edf192d0635a3c9 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: src/printsupport: Rerun conversion scriptKevin Funk2019-02-131-13/+21
| | | | | Change-Id: I0bdc4eefa5e1e78ba7f68da5848e32297c6af5a1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: Build qmake using CMakeKevin Funk2019-02-131-1/+139
| | | | | Change-Id: Ia2ad09774252154d19d7c80abfcd72ecd09025ae Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Replace "our" FindEGL.cmake with the ECM versionSimon Hausmann2019-02-132-32/+166
| | | | | | | | The ECM version now also does a compile test, which was the only real "functional" difference. Change-Id: I1d5cd590359feba7c7a38ff374992349d5943070 Reviewed-by: Volker Krause <volker.krause@kdab.com>
* Use rpath by default not only for building but also installed binariesSimon Hausmann2019-02-131-0/+14
| | | | | | | | | This makes it possible to use the binaries out of the box. This is particularly relevant for program binaries that link against QtCore dynamically, when trying to use these binaries during cross-compilation. Change-Id: I7dee93194be3fff5c6e3bbb9e202e4cf5e19b6d0 Reviewed-by: Volker Krause <volker.krause@kdab.com>
* cmake: enable vnc platform pluginAlbert Astals Cid2019-02-123-1/+44
| | | | | Change-Id: I5015681aff3c9ceb5c0b72571bc8756f3ada104c Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: set WrapOpenGL_FOUND to ONAlbert Astals Cid2019-02-121-0/+2
| | | | | | | | | | | | Otherwise the cmake summary at the end says -- The following packages have not been found: * WrapOpenGL It's OpenGL or GLESv2 that will show there as missing if needed Change-Id: I182f1299b86e1a4e24762d0bad6533c6136cbbcc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: FindWrapOpenGL->WrapOpenGLAlbert Astals Cid2019-02-121-1/+1
| | | | | Change-Id: Ic44d3ee806cf287a2c3cb36811b99418ea92d8a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Use CMakePushCheckStateVolker Krause2019-02-121-3/+3
| | | | | Change-Id: I58d779674363a7f7db4a7ea4ca4a9f4a9e271798 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix build without VulkanSimon Hausmann2019-02-121-2/+2
| | | | | | | | | The syncqt generated headers are optional, i.e. their source may not exist -- so for now make their installation optional (as it seems to have been the case with qmake). Change-Id: Ieaeb3d13a1d8ff1f158b5b1c918750fec48d3bef Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* Fix Desktop GL/EGL/GLESv2 linkageSimon Hausmann2019-02-128-8/+114
| | | | | | | | | | | | | | | | This change fixes a few things in one go: * cmake's FindOpenGL cannot be used reliably to detect EGL. So use a custom module for that. * Added a custom module for GLESv2 detection, as cmake's FindOpenGL does not support that. * Map CONFIG += opengl to a WrapOpenGL target, which links against either GLESv2 or libGL - just like mkspecs/features/*/opengl.prf * cmake's FindOpenGL remains in use solely to detect the availability of desktop gl. Change-Id: I9315e5ad1fd88e1b7dc7e920053e98fb51fea7fc Reviewed-by: Volker Krause <volker.krause@kdab.com>
* cmake: compile the networkmanager bearer pluginAlbert Astals Cid2019-02-122-1/+24
| | | | | Change-Id: Ia744afec6114266fcb693702db257fe36ba94b92 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: add localserver in networkLiang Qi2019-02-121-0/+26
| | | | | Change-Id: I319ffad73bb5f8285b1b2fa583d813667498c3dd Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: build the connman bearer pluginAlbert Astals Cid2019-02-122-1/+24
| | | | | Change-Id: I034ac995e231e7ad380ca9680e72037a573a1003 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Build the generic bearer pluginAlbert Astals Cid2019-02-123-1/+39
| | | | | Change-Id: I3ab356e23e22499be98a626d043e2cfb9fc51105 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Find and build odbc pluginAlbert Astals Cid2019-02-124-2/+37
| | | | | Change-Id: I479d2b1cc897f601ef68b10272c9396e52228201 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: Find and build psql pluginAlbert Astals Cid2019-02-124-2/+32
| | | | | Change-Id: I8cbc8ab0061f67824d78198cbb926f0625fc7e41 Reviewed-by: Liang Qi <liang.qi@qt.io>
* cmake: add TODOs in plugins/platforms for futureLiang Qi2019-02-121-4/+56
| | | | | Change-Id: I472b87cdd4f87633df7867c161ab861fba519bd3 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* cmake: Fix more old-style CMake macrosKevin Funk2019-02-122-5/+5
| | | | | | | Use the proper target name for the Qt tools Change-Id: I04b3aed7b58d44e60597223340d66ac97ea083cb Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* cmake: update README.mdLiang Qi2019-02-121-0/+10
| | | | | | | Added info for using homebrew on macOS. Change-Id: Ie425793d3de1e72a9342f6c2aaf67a4f85592f3a Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
* cmake: Search and enable the sqlite[3] pluginAlbert Astals Cid2019-02-127-17/+155
| | | | | | | | Added to QtFeature.cmake a way to be able to run feature_module begin and end without having an actual module by passing NO_MODULE Change-Id: Ib708bd3878e2591da193d18563c8932cc4b75e7f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-07 22:06:16 +0000