summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.13'Brad King2018-12-130-0/+0
|\
| * CMake 3.13.2v3.13.2Brad King2018-12-131-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-12-131-1/+1
| |
* | Merge topic 'object-library-link'Brad King2018-12-125-1/+21
|\ \ | | | | | | | | | | | | | | | | | | bab24e782c target_link_libraries: Propagate dependencies of object libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2725
| * | target_link_libraries: Propagate dependencies of object librariesKyle Edwards2018-12-105-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this commit, linking against an object library did not propagate private link dependencies of object libraries to their consuming targets. This change implements the correct behavior. Fixes: #18692 Co-Author: Brad King <brad.king@kitware.com>
* | | Merge topic 'fix-configure-line-number'Brad King2018-12-123-5/+44
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe9a16c80f cmMakefile: Fix @CMAKE_CURRENT_LIST_LINE@ for ExpandVariablesInStringNew dda4755b46 cmMakefile: Fix ConfigureString not passing filename and line Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2675
| * | | cmMakefile: Fix @CMAKE_CURRENT_LIST_LINE@ for ExpandVariablesInStringNewArtur Ryt2018-12-123-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added check for variable name in @@ evaluation and test for configuring @CMAKE_CURRENT_LIST_LINE@ with new CMP0053 Fixes: #18646
| * | | cmMakefile: Fix ConfigureString not passing filename and lineArtur Ryt2018-12-123-3/+32
| | | | | | | | | | | | | | | | | | | | | | | | It enables to use CMAKE_CURRENT_LIST_LINE in string(CONFIGURE) Added tests for it for ${} and @@ notattion for old CMP0053 and ${} for new
* | | | Merge topic 'machoFormat'Brad King2018-12-121-7/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c86e82c092 Add Mach-O CMAKE_EXECUTABLE_FORMAT detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2722
| * | | | Add Mach-O CMAKE_EXECUTABLE_FORMAT detectionMaikel van den Hurk2018-12-101-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code for this was prototyped when ELF detection was added long ago but left commented out. Use either MH_MAGIC or MH_CIGAM for the 32-bit variant and use either or MH_MAGIC_64 or MH_CIGAM_64 for the 64-bit variant.
* | | | | Merge topic 'FindThreads-drop-irix'Brad King2018-12-127-81/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83dab0c123 FindThreads: Drop IRIX-specific options and results Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2717
| * | | | | FindThreads: Drop IRIX-specific options and resultsBrad King2018-12-077-81/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not need to support IRIX anymore, so drop relevant parts. In particular, the `CMAKE_THREAD_PREFER_PTHREAD` is frequently confused with `THREADS_PREFER_PTHREAD_FLAG`. Also remove references to the IRIX-specific options and results from other modules and tests.
* | | | | | Merge topic 'vs_conformance_mode_flags'Brad King2018-12-121-1/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0d6d01e52 VS: Add flag table entry for "permissive" flag to disable conformance mode Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2723
| * | | | | | VS: Add flag table entry for "permissive" flag to disable conformance modeJonathan Storey2018-12-101-1/+8
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | This flag is required to disable conformance mode on specific sources when it is otherwise enabled on most sources.
* | | | | | Merge topic 'default-test-timeout'Brad King2018-12-122-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3e0eb3307f Help: clarify documentation of ctest --timeout Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2721
| * | | | | | Help: clarify documentation of ctest --timeoutRegina Pfeifer2018-12-092-4/+5
| | | | | | |
* | | | | | | Merge topic 'output-converter-simplify'Brad King2018-12-1211-134/+117
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 33f08eec18 cmOutputConverter: Moved ContainedInDirectory to cmStateDirectory 87e810f223 cmOutputConverter: Moved ForceToRelativePath to cmSystem Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2665
| * | | | | | | cmOutputConverter: Moved ContainedInDirectory to cmStateDirectoryBruno Manganelli2018-12-088-46/+27
| | | | | | | |
| * | | | | | | cmOutputConverter: Moved ForceToRelativePath to cmSystemBruno Manganelli2018-12-079-88/+90
| | |_|/ / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-12-121-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-12-111-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'release-3.13'Brad King2018-12-100-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'cuda-arch-turing' into release-3.13Brad King2018-12-101-2/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !2724
* | \ \ \ \ \ Merge topic 'cuda-arch-turing'Brad King2018-12-100-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a5a8eb0c5 CUDA: Add CUDA 10 (Turing) detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2724
| * | | | | | CUDA: Add CUDA 10 (Turing) detectionAnton Chernov2018-12-101-2/+16
| | | | | | |
* | | | | | | Merge topic 'autogen-cleanups'Brad King2018-12-101-160/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7630eb1975 cmQtAutoGenInitializer: Reduce code duplication Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Tobias Hunger <tobias.hunger@gmail.com> Merge-request: !2689
| * | | | | | | cmQtAutoGenInitializer: Reduce code duplicationTobias Hunger2018-12-071-160/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not repeat the code used to find uic/rcc and moc exectuables.
* | | | | | | | Merge topic 'ninja-win-long-commands'Brad King2018-12-101-2/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cfd808ff19 cmLocalNinjaGenerator: Prevent echoing of lines in ninja generated batch files 2c3f2dfa5a cmLocalNinjaGenerator: Report line of failure in ninja generated batch file 2295040e85 cmLocalNinjaGenerator: Propagate failures from batch file back to ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2701
| * | | | | | | | cmLocalNinjaGenerator: Prevent echoing of lines in ninja generated batch filesMark O'Neill2018-12-061-0/+1
| | | | | | | | |
| * | | | | | | | cmLocalNinjaGenerator: Report line of failure in ninja generated batch fileMark O'Neill2018-12-061-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: 18676
| * | | | | | | | cmLocalNinjaGenerator: Propagate failures from batch file back to ninjaMark O'Neill2018-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18676
* | | | | | | | | Merge topic 'SWIG'Brad King2018-12-1021-4/+233
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dff28141dc UseSWIG: add management of SWIG option -module 7b3d4799f8 Help: update policy 0078 documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2669
| * | | | | | | | | UseSWIG: add management of SWIG option -moduleMarc Chevrier2018-12-0720-4/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When file property SWIG_MODULE_NAME is specified, provide option -module to SWIG compiler. Fixes: #18374
| * | | | | | | | | Help: update policy 0078 documentationMarc Chevrier2018-12-071-0/+2
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'cuda-arch-turing'Brad King2018-12-101-2/+16
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0f9533e61b CUDA: Add CUDA 10 (Turing) detection Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !2702
| * | | | | | | | | CUDA: Add CUDA 10 (Turing) detectionAnton Chernov2018-12-071-2/+16
| | | | | | | | | |
* | | | | | | | | | Merge topic 'file-read_symlink'Brad King2018-12-1014-4/+98
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 31840e363f file: Fix formatting of error in SIZE sub-command 98a39be6cf file: Add READ_SYMLINK sub-command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2705
| * | | | | | | | | | file: Fix formatting of error in SIZE sub-commandKyle Edwards2018-12-063-4/+5
| | | | | | | | | | |
| * | | | | | | | | | file: Add READ_SYMLINK sub-commandKyle Edwards2018-12-0612-0/+93
| | |_|/ / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge branch 'release-3.13'Brad King2018-12-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'backport-autogen_revert_implicit_includes' into release-3.13Brad King2018-12-073-6/+24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2709
| * \ \ \ \ \ \ \ \ \ Merge branch 'cpack-status-callback' into release-3.13Brad King2018-12-073-0/+13
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2696
* | \ \ \ \ \ \ \ \ \ \ Merge topic 'cpack-status-callback'Brad King2018-12-103-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a3ae1710e CPack/External: Fix status messages of staging scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2696
| * | | | | | | | | | | CPack/External: Fix status messages of staging scriptsNils Gladitz2018-12-073-0/+13
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set progress callback on cmake instance used by CPack. The progress callback is used to output STATUS messages which are otherwise missing when issued from e.g. CPack External staging scripts. Fixes: #18567
* | | | | | | | | | | Merge topic 'autogen_revert_implicit_includes'Brad King2018-12-103-4/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5a4007a3b Merge branch 'backport-autogen_revert_implicit_includes' 4be7f38d57 Autogen: Revert passing compiler implicit includes to moc 187481d4d9 Autogen: Revert passing compiler implicit includes to moc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2709
| * | | | | | | | | | Merge branch 'backport-autogen_revert_implicit_includes'Brad King2018-12-071-0/+13
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Autogen: Revert passing compiler implicit includes to mocSebastian Holtermann2018-12-073-6/+24
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing an incomplete list of compiler include directories causes a regression in the KIO project (and probably others). We need to disable it until the complete list is available (see #16291). Fixes: #18669 Issue: #18041
| * | | | | | | | | Autogen: Revert passing compiler implicit includes to mocSebastian Holtermann2018-12-072-4/+8
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Passing an incomplete list of compiler include directories causes a regression in the KIO project (and probably others). We need to disable it until the complete list is available (see #16291). Fixes: #18669 Issue: #18041
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-12-101-1/+1
| |_|_|_|_|_|/ / |/| | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-12-091-1/+1
| | | | | | | |