aboutsummaryrefslogtreecommitdiffstats
path: root/cmake
Commit message (Collapse)AuthorAgeFilesLines
* cmake: fix get_update_path_command() functionIvan Komissarov2020-12-041-1/+1
| | | | | | | | | Quotes in the command break setting PATH Amends 9c8451e9a76f1173d4c7fa4d538e2ed676743110 Change-Id: I2d5b40d9b302007da45c57e2f86856e175263c49 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* cmake: fix setting QBS_APP_INSTALL_DIR variableIvan Komissarov2020-12-041-1/+1
| | | | | | | It should be set before used Change-Id: I133c7791f9efbb1f76e898109503e120b5adf18e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Fix that target was accessed before it was createdEike Ziller2020-12-041-10/+12
| | | | | | | Amends c21932163779bcfe4577ac2e3326b8c113884829 Change-Id: I078df77ebfd7921c9c8bcaf131ae06a3a1fcd181 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: Fix building documentationIvan Komissarov2020-12-031-0/+13
| | | | | | | | It was never implemented Fixes: QBS-1618 Change-Id: I702410b546cacd439989268d3d4fbb18051d1819 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: Fix issues with configuring locations on WindowsEike Ziller2020-10-091-3/+11
| | | | | | | | | | | | Make DLL destination configurable independently of LIB destination. In Qt Creator we put DLLs into bin\, but LIBs into lib\. Fix installation of plugin DLLs by adding corresponding RUNTIME section. Fix setting PATH to Qt & Qbs libraries for BuildQbsResources. Change-Id: I5029e82b8822c7e3ad43afe69530b2d4e2f918b3 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: Make build output & install locations configurableEike Ziller2020-10-081-27/+39
| | | | | | | | So we can configure the right paths for direct inclusion in the Qt Creator build. Change-Id: Ie83eb402f0d9ce5f1ef32737921dc2ec8b43a315 Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
* cmake: fix default definesIvan Komissarov2020-08-271-1/+1
| | | | | | | Should be _SCL_SECURE_NO_WARNINGS, not _CRT_SECURE_NO_WARNINGS Change-Id: I339536cf751790edec46c058a8974abe79832d29 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: rename qbslogging -> qbsconsoleloggerIvan Komissarov2020-08-201-1/+1
| | | | | | | ...to match the Qbs build Change-Id: Ib17d9625bf06d2eed69f51cc0e6e6cbe7ba99085 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* qbsbuild: move logging to the static libraryIvan Komissarov2020-08-201-1/+4
| | | | | Change-Id: I94bd7288a9ef3b7a785a76386ff7d395cdd01f81 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: Fix export macros in add_qbs_libraryIvan Komissarov2020-08-201-3/+1
| | | | | | | | | | | We should not set those macros in the function, but we should set them independently for each target, otherwise the import/export macros for qbscore will be messed up. This amends b67b08f1c2c. Change-Id: Iff61ce050cd6c4c4e71d3e3e6a97cc3525459a39 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* cmake: Fix target namesIvan Komissarov2020-08-201-1/+1
| | | | | | | | | | It should be 'qbscore', not 'corelib'. Same for the static logging library. This amends b67b08f1c2c. Change-Id: I3b79ce75168360f8708b143471f0b4c223b2f5fd Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Initial CMake portIvan Komissarov2020-08-171-0/+207
This change allows to build Qbs using CMake build tool Tested platforms - Linux (gcc) - macOS (clang) - Windows (msvc2017) Missing features (compared to Qbs build) - Documentation build - Bundled QtScript support - Static build - .pc file for qbscore - qbs module for qbscore Change-Id: I09b5dadd6723d5a47e5ef2a9a38d3300488718f2 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-09 03:39:24 +0000