summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'docs_cmake_crosscompiling'Brad King2018-01-221-4/+22
|\ | | | | | | | | | | | | 60febda4 Help: Explain meaning and limitations of CMAKE_CROSSCOMPILING Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1672
| * Help: Explain meaning and limitations of CMAKE_CROSSCOMPILINGCraig Scott2018-01-181-4/+22
| | | | | | | | Fixes: #17653
* | Merge topic 'iwyu'Brad King2018-01-221-0/+3
|\ \ | | | | | | | | | | | | | | | | | | e720a343 IWYU: Add more workaround mappings for internal bits Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1681
| * | IWYU: Add more workaround mappings for internal bitsBrad King2018-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extend our hack section of mappings to work around IWYU incorrectly requiring: * bits/stdint-uintn.h for stdint.h * bits/stdint-intn.h for stdint.h * bits/types/mbstate_t.h for wchar.h
* | | Merge topic 'findopenmp-genex'Christian Pfeiffer2018-01-221-1/+1
|\ \ \ | |/ / |/| | | | | | | | | | | | | | ffa6f875 FindOpenMP: Employ genex where possible Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1676
| * | FindOpenMP: Employ genex where possibleChristian Pfeiffer2018-01-191-1/+1
| | | | | | | | | | | | Fixes: #17610
* | | CMake Nightly Date StampKitware Robot2018-01-221-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2018-01-211-1/+1
| | |
* | | Merge topic 'docs_cmake_lang_compiler_external_toolchain'Craig Scott2018-01-201-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f3e9bedd Help: CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN typo removal Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1679
| * | | Help: CMAKE_<LANG>_COMPILER_EXTERNAL_TOOLCHAIN typo removalCraig Scott2018-01-201-1/+1
| | |/ | |/|
* | | Merge topic 'reword-cmake-E-time-help'Craig Scott2018-01-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 73bb781d Help: Reword misleading docs for cmake -E time Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1677
| * | | Help: Reword misleading docs for cmake -E timeTaylor Braun-Jones2018-01-192-2/+2
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-01-201-1/+1
|/ / /
* | | Merge topic 'FindOpenGL-fix-typo'Brad King2018-01-191-1/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c2aec683 FindOpenGL: remove duplicate OpenGL::GL reference Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1668
| * | | FindOpenGL: remove duplicate OpenGL::GL referenceBen Boeckel2018-01-181-1/+0
| | | |
* | | | Merge topic 'cache-truncate-newlines'Brad King2018-01-1913-12/+131
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | c42b377c cmCacheManager: Test and document newline truncation behavior a9c48307 cmCacheManager: Truncate values containing newlines Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1652
| * | | cmCacheManager: Test and document newline truncation behaviorKyle Edwards2018-01-158-0/+43
| | | |
| * | | cmCacheManager: Truncate values containing newlinesKyle Edwards2018-01-155-12/+88
| | | | | | | | | | | | | | | | Fixes #16098.
* | | | CMake Nightly Date StampKitware Robot2018-01-191-1/+1
| |_|/ |/| |
* | | Merge branch 'release-3.10'Brad King2018-01-180-0/+0
|\ \ \
| * | | CMake 3.10.2v3.10.2Brad King2018-01-181-1/+1
| | | |
* | | | Merge topic 'autogen-parallel'Brad King2018-01-1864-2303/+4192
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Autogen: Rename cmQtAutogeneratorInitializer to cmQtAutoGenInitializerSebastian Holtermann2018-01-175-30/+30
| | | | |
| * | | | Autogen: Add release notes for (CMAKE_)AUTOGEN_PARALLELSebastian Holtermann2018-01-171-0/+10
| | | | |
| * | | | Autogen: Add documentation for (CMAKE_)AUTOGEN_PARALLELSebastian Holtermann2018-01-177-2/+43
| | | | |
| * | | | Autogen: Tests: Add AUTOGEN_PARALLEL testsSebastian Holtermann2018-01-1731-0/+475
| | | | |
| * | | | Autogen: Process files concurrently in AUTOMOC and AUTOUICSebastian Holtermann2018-01-1713-2275/+3620
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces concurrent thread processing in the `_autogen` target wich processes AUTOMOC and AUTOUIC. Source file parsing is distributed among the threads by using a job queue from which the threads pull new parse jobs. Each thread might start an independent ``moc`` or ``uic`` process. Altogether this roughly speeds up the AUTOMOC and AUTOUIC build process by the number of physical CPUs on the host system. The exact number of threads to start in the `_autogen` target is controlled by the new AUTOGEN_PARALLEL target property which is initialized by the new CMAKE_AUTOGEN_PARALLEL variable. If AUTOGEN_PARALLEL is empty or unset (which is the default) the thread count is set to the number of physical CPUs on the host system. The AUTOMOC/AUTOUIC generator and the AUTORCC generator are refactored to use a libuv loop internally. Closes #17422.
| * | | | Autogen: Tests: Fix MocInclude test(s)Sebastian Holtermann2018-01-179-0/+18
| | |_|/ | |/| |
* | | | Merge topic 'ctest-libuv-output-decode'Brad King2018-01-182-9/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a6e9b9c9 CTest: Fix process output read error cases c10119df CTest: Fix decoding of MBCS character split by buffering Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1667
| * | | | CTest: Fix process output read error casesBrad King2018-01-171-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libuv documentation states that the stream read callback may be called with `nread == 0` for EAGAIN. Handle this gracefully. It also states that the callee is responsible for closing the stream on error. Always close the stream for `nread < 0`.
| * | | | CTest: Fix decoding of MBCS character split by bufferingBrad King2018-01-172-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a single `cmProcessOutput` instance persistently to decode all output of a test process so that partial character bytes can be buffered.
* | | | | Merge topic 'FindTCL-thread-suffix'Brad King2018-01-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c9f66540 FindTCL: Find 8.6 libraries with 't' suffix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1663
| * | | | | FindTCL: Find 8.6 libraries with 't' suffixlorenz2018-01-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Building Tcl with `makefile.vc` produces library files with a `t` suffix to indicate threading support. Since threading support is on by default in 8.6 anyway, the libraries should be compatible. Issue: https://github.com/conda-forge/tk-feedstock/issues/12
* | | | | | Merge topic 'fix_ninja_cuda'Brad King2018-01-181-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2bd232b5 Ninja: Fixes CUDA device link in Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1662
| * | | | | | Ninja: Fixes CUDA device link in WindowsFrancisco Facioni2018-01-151-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nvcc in linker mode doesn't support response files Fixes: #17644
* | | | | | Merge topic 'msvc_cuda_8_explicitly_specify_cuda_language'Brad King2018-01-183-9/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 46abfedb CUDA: MSVC will now state files are cuda files when needed Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1658
| * | | | | | CUDA: MSVC will now state files are cuda files when neededRobert Maynard2018-01-123-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The MSVC CUDA build customizations before CUDA 9 would not explicitly add the -x cu option when building. This caused .cpp and .c files invoked with CudaCompile to be compiled as host code and not cuda. Now when we detect CUDA < 9 we will explicitly add this option to correct this bug.
* | | | | | | CMake Nightly Date StampKitware Robot2018-01-181-1/+1
| | | | | | |
* | | | | | | Merge topic 'FindDoxygen-macos-utils'Craig Scott2018-01-171-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2489e5af FindDoxygen: On macOS search in '/Applications/Utilities' too Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1661
| * | | | | | | FindDoxygen: On macOS search in '/Applications/Utilities' tooThomas Thielemann2018-01-161-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `FindDoxygen` already searches in hard-coded `/Applications/Doxygen.app` directories. Search in the `Utilities` subdirectory too in case users choose to put doxygen there.
* | | | | | | | Merge topic 'cmSourceGroup-modern-cxx'Craig Scott2018-01-173-46/+24
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 969c1f94 cmSourceGroup: code improvements; use std::string and C++11 loops Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1656
| * | | | | | | cmSourceGroup: code improvements; use std::string and C++11 loopsVitaly Stakhovsky2018-01-113-46/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Topic-rename: cmSourceGroup-modern-cxx
* | | | | | | | Merge topic 'fix-documentation'Brad King2018-01-171-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60216e15 Help: Improved MAIN_DEPENDENCY documentation of add_custom_command() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1665
| * | | | | | | | Help: Improved MAIN_DEPENDENCY documentation of add_custom_command()Christoph Ruediger2018-01-161-2/+4
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-01-171-1/+1
| |_|_|_|_|/ / / |/| | | | | | |
* | | | | | | | Merge topic 'extend-compile-language-genex'Brad King2018-01-1633-247/+219
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 506fda1c Genex: Enable COMPILE_LANGUAGE for INCLUDE_DIRECTORIES with VS and Xcode c2f79c98 Genex: Enable COMPILE_LANGUAGE for COMPILE_DEFINITIONS with VS and Xcode 0795d25b cmVisualStudio10TargetGenerator: Factor out include dir computation 1ab4d186 cmLocalVisualStudio7Generator: Clarify variable name of compiled language 07e1a743 cmLocalVisualStudio7Generator: Clarify condition for target that compiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1657
| * | | | | | | | Genex: Enable COMPILE_LANGUAGE for INCLUDE_DIRECTORIES with VS and XcodeBrad King2018-01-1221-144/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set of compile flags used for a target's C and C++ sources is based on the linker language. By default this is always the C++ flags if any C++ sources appear in the target, and otherwise the C flags. Therefore we can define the `COMPILE_LANGUAGE` generator expression in `INCLUDE_DIRECTORIES` to match the selected language. This is not exactly the same as for other generators, but is the best VS and Xcode can do. It is also sufficient for many use cases since the set of include directories for C and C++ is frequently similar but may be distinct from those for other languages like CUDA. Fixes: #17435
| * | | | | | | | Genex: Enable COMPILE_LANGUAGE for COMPILE_DEFINITIONS with VS and XcodeBrad King2018-01-1224-115/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set of compile flags used for a target's C and C++ sources is based on the linker language. By default this is always the C++ flags if any C++ sources appear in the target, and otherwise the C flags. Therefore we can define the `COMPILE_LANGUAGE` generator expression in `COMPILE_DEFINITIONS` to match the selected language. This is not exactly the same as for other generators, but is the best VS and Xcode can do. It is also sufficient for many use cases since the set of definitions for C and C++ is frequently similar but may be distinct from those for other languages like CUDA. Issue: #17435
| * | | | | | | | cmVisualStudio10TargetGenerator: Factor out include dir computationBrad King2018-01-112-6/+16
| | | | | | | | |
| * | | | | | | | cmLocalVisualStudio7Generator: Clarify variable name of compiled languageBrad King2018-01-111-4/+6
| | | | | | | | |