summaryrefslogtreecommitdiffstats
path: root/util
Commit message (Collapse)AuthorAgeFilesLines
...
* | pro2cmake.py: generate code for WAYLAND*SOURCESJohan Klokkhammer Helsing2019-09-241-1/+31
| | | | | | | | | | | | | | | | | | | | WAYLANDCLIENTSOURCES and WAYLANDSERVERSOURCES is used heavily throughout QtWayland. Task-number: QTBUG-78177 Change-Id: I4507447054c435f78e82c2ca3e9404288db6c1f6 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | cmake: Implement the ~= operator in pro2cmakeJoerg Bornemann2019-09-231-2/+34
| | | | | | | | | | | | Change-Id: I3fadd0038d517d197cce898d10edd6ba452adea9 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | pro2cmake: Ignore generated .qrc filesJoerg Bornemann2019-09-231-0/+3
| | | | | | | | | | | | | | | | | | | | | | ...instead of complaining about non-existing files. qtscxml/tests/auto/scion/scion.pro has RESOURCES = $$OUT_PWD/scion.qrc Change-Id: I5737fe5078c87689152fc7fa0d8d25ddc2b1a00f Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | pro2cmake: Improve handling of requires clausesAlexandru Croitor2019-09-231-11/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the grammar to parse and extract the whole expression that is present in the requires clause. Make sure to preprocess the parsed content as a condition, so that the value passed to map_condition and simplify_condition is valid and the functions can handle more complicated conditions like qtConfig() and if(). Wrap the final condition with an extra pair of parentheses, so that the negated condition is computed correctly. Handle the require clause in subdir projects, top level tests projects, regular test projects, as well as top level repo projects. Examples are not yet handled, because the would require some kind of CMake public api to e.g. query if a feature is enabled. Change-Id: I9af96cf022e47b66f24db3ca15d3803dda7a5d7c Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | pro2cmake: Fix regexp for parsing env var expansionAlexandru Croitor2019-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | The qmake syntax for env var expansion is "$$()". The parantheses are not optional, so the optional "?" modifiers should be removed. This fixes the failing test_recursive_expansion pytest. Amends c58df80cf7926b07da9fe6515230bd4295c1fc6d. Change-Id: I5d7217555287ee7d96d6b38027964b1141af208a Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* | pro2cmake: Handle if() conditions with pyparsingAlexandru Croitor2019-09-231-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used a regular expression that matched parentheses, but the regexp didn't match the parantheses in a balanced way if there was more than one pair. Instead use a helper function that uses pyparsing to match balanced parantheses, and removes the if keyword, leaving just the nested expression. Change-Id: Ie621e6a305e57aa411838288599366ccfba063cc Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* | pro2cmake: Fix regressions introduced by reformat changeAlexandru Croitor2019-09-231-17/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sympy uses eval() inside its code, and that can raise an AttributeError exception, so we have to catch that. This happened when converting qml.pro in qtdeclarative. Also the formatting change removed the raising of an exception when an unhandled function was encountered in handle_function_value, which caused not returning any value in such a case. Instead just return the whole expression string, without checking if the function is in some whitelist. Also encountered in qml.pro. Amends 91634c3c9b8d4f68f0ebd2ac76a8b5b79e4b4c94. Change-Id: I47b73af1de0180becb9ef4fb78a8c35a04928d34 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | pro2cmake: Fix default mutable arguments usageAlexandru Croitor2019-09-221-5/+17
| | | | | | | | | | | | Change-Id: I91f2632f46539a1e5009b598625d78f61a051588 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | pro2cmake: Small fixes and adjustments reported by flake8 and IDEAlexandru Croitor2019-09-221-11/+22
| | | | | | | | | | | | Change-Id: I13fd2f20414647b75c8da237857248808dddaa40 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Reformat python files using blackAlexandru Croitor2019-09-222-26/+49
| | | | | | | | | | | | Change-Id: I0cc8ed89e2057b65f4fa34294eccffae642f2c73 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | pro2cmake: Handle generation of config.testsAlexandru Croitor2019-09-221-1/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle conversion of config.tests that are used as out-of-line tests in configure.json. The script should able to handle conversion of simple config tests including nested scopes. One thing that will probably be needed in the future is handling of pkconfig which is used in qtwebengine config.tests. There is also a hardcoded list of config tests which should not be automatically converted by pro2cmake, either because they were hand written, or because it doesn't make sense to convert them for now. Incidentally, we should fix example conversion to also handle nested scopes, similarly to how it's done for config.tests. Change-Id: I862e67c4d19d5ed8cb7fc7c9f9aaf6e3d503aa03 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | configurejson2cmake: handle out-of-line config testsAlexandru Croitor2019-09-221-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate appropriate qt_config_compile_test() calls for config tests that have CMake projects. These are protected by an if(EXISTS) check so that configuration doesn't fail for repos where the config tests have not been ported yet. Adjust the qt_config_compile_test() function to use try_compile for projects specified via new PROJECT_PATH argument. Change-Id: I83c061e384f68688a654b782fd7a9bede282d1e3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Skip converting projects under tests/auto/installed_cmakeAlexandru Croitor2019-09-211-0/+2
| | | | | | | | | | Change-Id: Id26320fb55f7f0ae4b18726b0794a4a1f169c80f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Adapt string formatting in util/cmakeCristian Maureira-Fredes2019-09-214-121/+118
| | | | | | | | | | | | | | | | Second and final batch of changes related to string formatting styling. Change-Id: Ifc0e999ee95fe52fd076ac2f001b4a58f82ab5be Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | cmake: Let pro2cmake use private statechart API for non-examplesJoerg Bornemann2019-09-201-2/+5
| | | | | | | | | | Change-Id: If6206f2377e90ba7f8502029a1cc74856a2e03a1 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add support for requires() statements in top-level .pro filesSimon Hausmann2019-09-201-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For example qtserialport has requires(!winrt) and with this patch it gets translated to project(...) if(WINRT) return() endif() find_package(...) qt_build_repo(...) Change-Id: Ic38b803b464037a42adc55930947f57c5efa7b45 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Add platform mapping for emscriptenSimon Hausmann2019-09-201-0/+1
| | | | | | | | | | | | | | | | EMSCRIPTEN is the name in cmake land as per emscripten's toolchain file. Change-Id: I11fa444204003f25f14fbf993ecf6766bf37d884 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | configurejson2cmake: Add special case handling for Windows BT config testsOliver Wolff2019-09-201-0/+5
| | | | | | | | | | | | Change-Id: Id73c44f5b7faff7392e7a8245e5e26e7dfe78cd8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | pro2cmake: Translate STATECHARTS to qt6_add_statechartsJoerg Bornemann2019-09-201-0/+13
| | | | | | | | | | Change-Id: I461768e67ce8fa7dae70a057df340e9c9a2bc14e Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: pro2cmake: Do not mis-report used values as ignoredTobias Hunger2019-09-201-0/+4
| | | | | | | | | | | | | | | | | | | | Do not mis-report "PLUGIN_TYPE", "PLUGIN_CLASS_NAME", "CLASS_NAME" and "MODULE_PLUGIN_TYPES" as ignored. The script evaluates these. Change-Id: I26546a7eff61a20afe68168a865fe3ac99f66319 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | CMake: pro2cmake: Handle OBJECTIVE_HEADERSTobias Hunger2019-09-201-1/+1
| | | | | | | | | | Change-Id: I9a7b9c96530e8c922cf4aa5b6580e5579829db87 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Extend globbing support in resourcesLeander Beernaert2019-09-201-16/+28
| | | | | | | | | | | | | | | | | | | | Extend globbing support in resource in order to be able to handle globbing expression present in qmake expression such as RESOURCE.files = *.qml Change-Id: I55a38c0bdc231a6a1ddbd65be7f57ca6f7dc2932 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | CMake: Use FindWaylandScanner.cmake from extra-cmake-modulesJohan Klokkhammer Helsing2019-09-201-0/+2
| | | | | | | | | | | | | | | | Change-Id: Iaf78f215396671fc6f351ac20e686cfd2c39664f Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | pro2cmake: skip tuple declaration on condition strCristián Maureira-Fredes2019-09-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases after cleaning and simplifying the conditions you can end up with the following line: ((())) Python interprets that as an empty tuple: >>> a = ((())) >>> a () and then the simplify_condition (sympy) method fails to continue with an error: File ".../util/cmake/pro2cmake.py", line 1993, in simplify_condition condition_expr = simplify_logic(condition) File ".../sympy/logic/boolalg.py", line 2292, in simplify_logic expr = expr.xreplace(dict(zip(variables, s))) AttributeError: 'tuple' object has no attribute 'xreplace' You can see this behavior with the file: qtmultimedia/tests/auto/unit/multimediaqml.pro Change-Id: Ied4285b67f1e567660be49f6610311199bc48a22 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | pro2cmake: exclude 3rdparty libs from examplesCristián Maureira-Fredes2019-09-191-2/+5
| | | | | | | | | | | | | | | | | | | | | | There are some libraries inside examples that cannot be properly translated due to the fact that the is_example variable is True. This condition excludes it, for example: qtmultimedia/examples/multimedia/spectrum/3rdparty/fftreal/ Change-Id: I68a1e7d1684ab4604f54b6d16bf88d04e3214ba9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix formatting for test dataLeander Beernaert2019-09-191-2/+2
| | | | | | | | | | | | | | Add missing f parameter and globbing expression. Change-Id: I0eedb59e47537f9cf42a0b9d9471ddfc87ee48f2 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | cmake: Add scxml to the library mappingJoerg Bornemann2019-09-191-0/+1
| | | | | | | | | | | | Change-Id: I86653af25fbbc2d269eb439ceefaa2f4d4ebde28 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | Add Qml plugin example supportLeander Beernaert2019-09-191-46/+247
| | | | | | | | | | | | | | | | | | | | | | Extend the example writing section to handle qml plugins. Detection is based on whether the plugin config is detected an the target links against Qml. add_qt_qml_module() now uses the the public facing API underneath. Change-Id: I2ccd06548e7b5b18c9dc3338b835bc115fa97809 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Fix casing of public API functionsSimon Hausmann2019-09-191-1/+1
| | | | | | | | | | | | | | | | | | Use lower case for the function name as that's cmake style. Change-Id: I6c53166aa3a8cece4abe8a485e06bd359fc12a06 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | Fix add_qt_docs callsSimon Hausmann2019-09-191-1/+1
| | | | | | | | | | | | | | | | Brown paper bag for me, don't use a comma to separate parameters when calling a function. Change-Id: I21e16142fab4fd1c2714df13cd6a892b036e899a Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Add SDL2 to 3rd-party library mappingMårten Nordheim2019-09-181-0/+1
| | | | | | | | | | | | Change-Id: I9f9df259340271b22a75ddfa6112ecba0f25bbbf Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | pro2cmake: Handle qmake env variables in file pathsAlexandru Croitor2019-09-181-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace things like $$(FOO) to $ENV{FOO}. This is needed to stop the script from crashing when it sees $$(FOO) in a .pro file, like in qtmultimedia/src/plugins/directshow/directshow.pro A better approach in the future will be to write a Find module that uses the env var to find the relevant headers, and then instead use a CMake cache variable, to make the build more robust in case the env var is removed after first configuring the project. Change-Id: Ia5b3dc3a90e1d4159a8b90acdade85f34b5165f9 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* | Add option to generate pro2cmake on failed onesCristian Maureira-Fredes2019-09-181-0/+11
| | | | | | | | | | | | | | | | The option --only-missing was added to check only the cases where there is a pro file and not a CMakeLists.txt Change-Id: Ifc6233552757e0afe8e7242a79f958e8bc77f823 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix indentation inside group_and_print_sub_dirsCristián Maureira-Fredes2019-09-181-9/+2
| | | | | | | | | | | | Change-Id: I34a737ae4914795f96900f2b72d0d15a3f5652d5 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Improve styling of util/cmake scriptsCristian Maureira-Fredes2019-09-1810-2048/+2752
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flake8 was used to evaluate the file, with a couple of exeptions: E501,E266,W503 black was used to reformat the code automatically The changes were: * Added a README that explains how to use pipenv and pip, * Remove unnecessary return statements, * Remove '\' from the end of the lines, * Use f-strings (>= 3.6) since we are requiring Python 3.7, * Commenting unused variables, * Adding assert when Python >= 3.7 is not being used, * Wrapping long lines to 100 (Qt Style), * Re-factoring some lines, * Re-ordering imports, * Naming `except` for sympy (SympifyError, TypeError) Change-Id: Ie05f754e7d8ee4bf427117c58e0eb1b903202933 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Don't create "gui" applications when linking against testlibSimon Hausmann2019-09-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In qmake land, testlib.pro has "console" in MODULE_CONFIG, so linking against testlib implicies CONFIG += console. The need for a console app is typically also covered by other cases, except in qtdeclarative's qqmldebugjsserver binary (and some others). They are not test helper binaries, they are not Qt tests themselves, but they must be console apps and due to their QT += testlib in the .pro they become console apps. So with cmake they also must be console apps so that the unit tests that launch them and read their stdout can pass. Change-Id: I687fdc910b550051750be74ecd176dd96626675c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix up documentation integration placeholderSimon Hausmann2019-09-181-13/+26
| | | | | | | | | | | | | | | | | | | | In the future need will need to continue to tie qdoc runs still to targets, just like with qmake. This change prepares us for that by ensuring that add_docs takes two parameters and that any re-generated CMakeLists.txt from now on gets it right. Change-Id: Id0256dc1e2f2f59f3b4e4ca98f0d10d025d189fb Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | CMake: add Qt::TextToSpeech to library mappingFrederik Gladhorn2019-09-181-0/+1
| | | | | | | | | | Change-Id: Ib682dede7d8e99461b146e9ef71e6d455daa8b6e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | CMake: add library mapping for QtSpeechFrederik Gladhorn2019-09-181-0/+3
| | | | | | | | | | | | Change-Id: I274e7382b1593dcb010f5f03ba0e2ccc9a37e5b8 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | cmake: Add library mappings for qtwaylandJohan Klokkhammer Helsing2019-09-172-1/+6
| | | | | | | | | | | | Change-Id: I9d394229073579df104e21c539bbbb614ef8efbd Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | Add initial support for QtKnx cmakeKarsten Heimrich2019-09-171-0/+1
| | | | | | | | | | | | Change-Id: I419d15ca0bb0b02e11001b75d0c612dddfa3abec Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | pro2cmake: Handle nested lists in handle_function_valueAlexandru Croitor2019-09-171-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Needed to successfully parse qtconnectivity projects where there are expressions like: WINDOWS_SDK_VERSION = $$member($$list($$split(WINDOWS_SDK_VERSION_STRING, .)), 2) Also fix '$$member' to be handled in the function. Change-Id: I35b5cff8c39b3a35d485d1d72f5d668cccbe9b2f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* | Add a mapping for QtSerialBusAlex Blasche2019-09-171-0/+1
| | | | | | | | | | Change-Id: I3664dfe5a7aa064ea4fa8f9455242815a359f346 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | pro2cmake.py: State dependenciesFriedemann Kleint2019-09-171-1/+2
| | | | | | | | | | Change-Id: I26234c68b781b983022c73a2d4206550f25b0232 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | run_pro2cmake.py: Run on WindowsFriedemann Kleint2019-09-171-2/+6
| | | | | | | | | | | | | | | | | | Prefix by python executable and drop os.nice. Change-Id: Idd1d0de6695887652db84261da1130a084e5af78 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* | pro2cmake: Support QML IMPORTPATH with multiple elementsJüri Valdmann2019-09-171-4/+4
| | | | | | | | | | | | Change-Id: I8113d7dd4e7967d020d59a5b4104e8366d55283c Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Add Qt Coap to the library mappingSona Kurazyan2019-09-171-0/+1
| | | | | | | | | | | | Task-number: QTBUG-78308 Change-Id: I6ba6f84354d7d008e128c784e24db00ecd67647a Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | pro2cmake: Remove warning about line continuationsJoerg Bornemann2019-09-171-4/+0
| | | | | | | | | | | | | | | | Almost every non-trivial .pro file has line continuations. Remove the warning as there's nothing the user can do about it. Change-Id: Ic8a54e5e5cc39a31267800edde4b0ff2b0276a48 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add expansion for $$files() in RESOURCESLeander Beernaert2019-09-171-10/+33
| | | | | | | | | | | | | | | | Expand $$files() when processing resources. Change-Id: I55a10dad65461db8640450609414fcfb0bb5d103 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | pro2cmake: Recursively expand $$FOO variablesAlexandru Croitor2019-09-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given HEADERS = $$PUBLIC_HEADERS $$PRIVATE_HEADERS $$PUBLIC_HEADERS can be expanded into a list of source files which in turn contain $$PWD/foo.cpp. The $$PWD needs to be expanded as well. This is the case for qtwebsockets/src/websockets/websockets.pro project. Change-Id: I3aa14203ee8d177fadd12a7e3212c3250970e0a8 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-10 04:18:28 +0000