diff options
| author | Brad King <brad.king@kitware.com> | 2018-01-18 14:46:20 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-01-18 14:46:29 (GMT) |
| commit | c1ea96d04c90ac174989b3771ff90c001189036b (patch) | |
| tree | 239cb3b0cdc16ff5717d4d1e327b0d1604f2d499 /Modules | |
| parent | 84e2a7e58a897f9003f02afb2b0feb9c5923a27f (diff) | |
| parent | 9cfa213aa62e8a7b73fd0ba63e6e80ba86082e52 (diff) | |
| download | CMake-c1ea96d04c90ac174989b3771ff90c001189036b.zip CMake-c1ea96d04c90ac174989b3771ff90c001189036b.tar.gz CMake-c1ea96d04c90ac174989b3771ff90c001189036b.tar.bz2 | |
Merge topic 'autogen-parallel'
9cfa213a Autogen: Rename cmQtAutogeneratorInitializer to cmQtAutoGenInitializer
79908ae4 Autogen: Add release notes for (CMAKE_)AUTOGEN_PARALLEL
45ee4979 Autogen: Add documentation for (CMAKE_)AUTOGEN_PARALLEL
6f4b6613 Autogen: Tests: Add AUTOGEN_PARALLEL tests
a008578d Autogen: Process files concurrently in AUTOMOC and AUTOUIC
488baaf0 Autogen: Tests: Fix MocInclude test(s)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1632
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/AutoRccInfo.cmake.in | 4 | ||||
| -rw-r--r-- | Modules/AutogenInfo.cmake.in | 1 |
2 files changed, 1 insertions, 4 deletions
diff --git a/Modules/AutoRccInfo.cmake.in b/Modules/AutoRccInfo.cmake.in index 5457a6f..cbab4a7 100644 --- a/Modules/AutoRccInfo.cmake.in +++ b/Modules/AutoRccInfo.cmake.in @@ -1,10 +1,6 @@ # Meta set(ARCC_MULTI_CONFIG @_multi_config@) # Directories and files -set(ARCC_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/") -set(ARCC_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/") -set(ARCC_CMAKE_CURRENT_SOURCE_DIR "@CMAKE_CURRENT_SOURCE_DIR@/") -set(ARCC_CMAKE_CURRENT_BINARY_DIR "@CMAKE_CURRENT_BINARY_DIR@/") set(ARCC_BUILD_DIR @_build_dir@) # Qt environment set(ARCC_RCC_EXECUTABLE @_qt_rcc_executable@) diff --git a/Modules/AutogenInfo.cmake.in b/Modules/AutogenInfo.cmake.in index 9a4a06d..7320c0a 100644 --- a/Modules/AutogenInfo.cmake.in +++ b/Modules/AutogenInfo.cmake.in @@ -1,5 +1,6 @@ # Meta set(AM_MULTI_CONFIG @_multi_config@) +set(AM_PARALLEL @_parallel@) # Directories and files set(AM_CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@/") set(AM_CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@/") |