diff options
| author | Ivan Komissarov <abbapoh@gmail.com> | 2021-05-09 20:27:28 +0200 |
|---|---|---|
| committer | Ivan Komissarov <ABBAPOH@gmail.com> | 2021-05-18 08:37:29 +0000 |
| commit | b1ccd9ab328cc7f7e34ab653ec93f389b9945e19 (patch) | |
| tree | 8ce97344b4ae475d2965802c50a93957d6950502 /CMakeLists.txt | |
| parent | 3ec5e234fe40985d58839409c3dce53d4cd78f17 (diff) | |
| download | qbs-b1ccd9ab328cc7f7e34ab653ec93f389b9945e19.tar.gz | |
cmake: Add bundled QtScript build
Also, make QtScript dependency optional like we do in the Qbs build.
Tested on macOS, Linux and Windows.
CMake 3.15 is now required for the CMP0092 policy which removes default
warning flags from CMAKE_CXX_FLAGS.
Change-Id: I199fb802d5ad72d1ac8d5a89c05372c43581c95d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b95f959d..2e3d15219 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 3.15) ## Add paths to check for cmake modules: list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") @@ -29,10 +29,12 @@ if(WITH_TESTS) endif() find_package(Qt5 - COMPONENTS Concurrent Core Gui Network Script Widgets Xml ${QT_TEST_COMPONENT} + COMPONENTS Concurrent Core Gui Network Widgets Xml ${QT_TEST_COMPONENT} REQUIRED ) +find_package(Qt5 COMPONENTS Script) + add_subdirectory(src) add_subdirectory(doc) add_subdirectory(share) |