summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Copyright.txt: Update year range to end in 2018Brad King2017-12-201-1/+1
|
* Merge branch 'release-3.10'Brad King2017-12-200-0/+0
|\
| * Merge branch 'backport-autogen-nested-lists-fix' into release-3.10Brad King2017-12-202-1/+4
| |\ | | | | | | | | | Merge-request: !1606
* | \ Merge topic 'autogen-nested-lists-fix'Brad King2017-12-202-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 493ad056 Merge branch 'backport-autogen-nested-lists-fix' into autogen-nested-lists-fix 683e9023 Autogen: Fix for problematic nested list separator 3ce7eece Autogen: Fix for problematic nested lists separator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1607
| * \ \ Merge branch 'backport-autogen-nested-lists-fix' into autogen-nested-lists-fixBrad King2017-12-200-0/+0
| |\ \ \ | | | |/ | | |/|
| | * | Autogen: Fix for problematic nested list separatorSebastian Holtermann2017-12-202-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AutogenInfo.cmake file the separator for nested lists was `@LSEP@` which led to a speed regression because the `@` character triggered an (unsuccessful) expression evaluation. By setting the policy version of the CMake instance in the `_autogen` target to 3.9, the OLD `@` evaluating behavior controlled by policy CMP0053 is disabled. Also the nested lists separator string is changed to `<<<S>>>`, which solves the problem twofold. Issue: #17570
| * | | Autogen: Fix for problematic nested lists separatorSebastian Holtermann2017-12-182-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the AutogenInfo.cmake file the separator for nested lists was `@LSEP@` which led to a speed regression because the `@` character triggered an (unsuccessful) expression evaluation. By setting the policy version of the CMake instance in the `_autogen` target to 3.9, the OLD `@` evaluating behavior controlled by policy CMP0053 is disabled. Also the nested lists separator string is changed to `<<<S>>>`, which solves the problem twofold. Closes #17570
* | | | Merge topic 'update-kwsys'Brad King2017-12-201-0/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4966c8d8 Merge branch 'upstream-KWSys' into update-kwsys 86399e49 KWSys 2017-12-15 (8f755ee9) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1597
| * \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-12-151-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-12-15 (8f755ee9)
| | * | | | KWSys 2017-12-15 (8f755ee9)KWSys Upstream2017-12-151-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 8f755ee93451e580aa7b5ed6cee9e6c5da81e7d0 (master). Upstream Shortlog ----------------- Volo Zyko (1): 9f6cd407 SystemTools: Fix removing of soft links to directories on Windows.
* | | | | | Merge topic 'cuda-mixed-cxx-standard'Brad King2017-12-204-73/+87
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4b7618d1 CUDA: Fix CUDA_STANDARD selection via cxx_std_11 with CXX_STANDARD 1d2d9c18 cmMakefile: Refactor determining a targets C++ standard level Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1590
| * | | | | | CUDA: Fix CUDA_STANDARD selection via cxx_std_11 with CXX_STANDARDRobert Maynard2017-12-154-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When C++ features require a certain C++/CUDA level, verify or update the standard level target property for each language independently. While at it, add missing rejection of invalid `CUDA_STANDARD` property values. Co-Author: Brad King <brad.king@kitware.com> Fixes: #17519
| * | | | | | cmMakefile: Refactor determining a targets C++ standard levelRobert Maynard2017-12-151-73/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original code doesn't scale well as we add support for each new language level. Co-Author: Brad King <brad.king@kitware.com>
* | | | | | | CMake Nightly Date StampKitware Robot2017-12-201-1/+1
| | | | | | |
* | | | | | | Merge topic 'winarm64'Christian Pfeiffer2017-12-191-29/+46
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f3933d3 Address code review feedback 14ebad53 Use IMAGE_FILE_HEADER and add missing Arm 32bit images support 8950183b Add Arm64 support to COFF symbol export feature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1603
| * | | | | | | Address code review feedbackJacek Blaszczynski2017-12-181-27/+31
| | | | | | | |
| * | | | | | | Use IMAGE_FILE_HEADER and add missing Arm 32bit images supportJacek Blaszczynski2017-12-181-13/+25
| | | | | | | |
| * | | | | | | Add Arm64 support to COFF symbol export featureJacek Blaszczynski2017-12-171-2/+3
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-191-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'findliblzma-win-name'Christian Pfeiffer2017-12-181-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | de706fe0 FindLibLZMA: Add library name for Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1605
| * | | | | | | FindLibLZMA: Add library name for WindowsChristian Pfeiffer2017-12-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17568
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-181-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-171-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-12-161-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'FindFLTK-per-config'Brad King2017-12-151-161/+196
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f1299f5d FindFLTK: Find debug and release variants separately d9154e52 FindFLTK: revise .rst markup ccc9a6c7 FindFLTK: fix indentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1563
| * | | | | | FindFLTK: Find debug and release variants separatelyStefano Sinigardi2017-12-141-16/+43
| | | | | | |
| * | | | | | FindFLTK: revise .rst markupStefano Sinigardi2017-12-141-31/+40
| | | | | | |
| * | | | | | FindFLTK: fix indentationStefano Sinigardi2017-12-141-134/+133
| | | | | | |
* | | | | | | Merge topic 'vs-vcxproj-lowercase-utf-8'Brad King2017-12-152-0/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 907bc354 VS: Emit "utf-8" encoding as lowercase in .vcxproj headers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1594
| * | | | | | | VS: Emit "utf-8" encoding as lowercase in .vcxproj headersVitaly Stakhovsky2017-12-142-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Match the XML preamble generated by VS 2010 and later.
* | | | | | | | Merge topic 'makefile-simplify-fortran'Brad King2017-12-159-140/+22
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ab9a625 Makefiles: Drop 'requires' step and its supporting infrastructure 5f2e2c38 Makefiles: Avoid nested make calls for Fortran module dependencies Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1523
| * | | | | | | | Makefiles: Drop 'requires' step and its supporting infrastructureYurii Batrak2017-12-148-131/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'requires' step was used to provide implicit dependencies between the generated Fortran module files and a Fortran target that needs these module files to ensure the correct compilation order. After recent refactoring to resolve all dependencies explicitly through `.mod.stamp` make targets, the separate 'requires' step is not needed anymore.
| * | | | | | | | Makefiles: Avoid nested make calls for Fortran module dependenciesYurii Batrak2017-12-143-10/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Makefiles generated by cmake use a series of nested calls to build `*.provides.build` targets that are used when the 'requires' step is needed. That leads to significant degradation of the build time for incremental builds. Re-arrange dependencies to eliminate the nested calls. Explicit `.mod.stamp` targets introduced by this commit could lead to situation when a stamp file always older than its dependency. This happens during the incremental build when building of an updated Fortran source produces a module file that has no differences from the stored stamp file. In such case `cmake_copy_f90_mod` will be triggered on each new build to compare a module file with the corresponding stamp file. This behavior is expected and can not be changed without nested calls that slow down the build. The copy-if-different check is much cheaper than an entire nested make call.
* | | | | | | | | Merge topic 'fix_failing_ResolveDeviceSymbols_test'Brad King2017-12-152-15/+10
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81642989 Cuda: ResolveDeviceSymbols now properly execute everywhere. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1593
| * | | | | | | | Cuda: ResolveDeviceSymbols now properly execute everywhere.Robert Maynard2017-12-132-15/+10
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version had two bugs that caused the JIT runtime errors. 1. It was building the executable without separable compilation enabled 2. All kernel launches will fail if any kernel is missing a symbol, that is why the call to file2_launch_kernel had to be removed
* | | | | | | | CMake Nightly Date StampKitware Robot2017-12-151-1/+1
| | | | | | | |
* | | | | | | | Merge branch 'release-3.10'Brad King2017-12-140-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'cmGraphVizWriter_Interface_Dependers' into release-3.10Brad King2017-12-142-15/+27
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | Merge-request: !1581
* | | | | | | | Merge topic 'per-source-COMPILE_LANGUAGE-genex-support'Brad King2017-12-1417-64/+210
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 10f58b27 Genex: Per-source $<COMPILE_LANGUAGE:...> support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1575
| * | | | | | | | Genex: Per-source $<COMPILE_LANGUAGE:...> supportMarc Chevrier2017-12-1317-64/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17542
* | | | | | | | | Merge topic 'autogen-separate-tests'Brad King2017-12-14312-686/+642
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 540d08f4 Autogen: Tests: Move QtAutoUicInterface test to QtAutogen/UicInterface b1504f9f Autogen: Tests: Separate RerunRccDepends test e9fcd154 Autogen: Tests: Separate RerunMocPlugin test 54b4ff2a Autogen: Tests: Separate RerunMocBasic test 4988746e Autogen: Tests: Separate Complex test 6ce6fd42 Autogen: Tests: Separate StaticLibraryCycle test 45b6776a Autogen: Tests: Separate SameName test d7868687 Autogen: Tests: Separate MacOsFW test ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1578
| * | | | | | | | | Autogen: Tests: Move QtAutoUicInterface test to QtAutogen/UicInterfaceSebastian Holtermann2017-12-1312-65/+7
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate RerunRccDepends testSebastian Holtermann2017-12-1317-141/+27
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate RerunMocPlugin testSebastian Holtermann2017-12-1325-22/+29
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate RerunMocBasic testSebastian Holtermann2017-12-1312-97/+102
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate Complex testSebastian Holtermann2017-12-1360-142/+5
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate StaticLibraryCycle testSebastian Holtermann2017-12-1311-13/+20
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate SameName testSebastian Holtermann2017-12-1326-5/+7
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate MacOsFW testSebastian Holtermann2017-12-139-8/+6
| | | | | | | | | |
| * | | | | | | | | Autogen: Tests: Separate ObjectLibrary testSebastian Holtermann2017-12-139-4/+5
| | | | | | | | | |