summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmake-gui: trim spaces from user-created variable namesClinton Stimpson2017-01-201-1/+1
| | | | Fixes: #15955
* Merge topic 'cmCTestBuildHandler-fix-warning'Brad King2017-01-171-1/+1
|\ | | | | | | | | f3864452 cmCTestBuildHandler: Fix warning in FragmentCompare signature
| * cmCTestBuildHandler: Fix warning in FragmentCompare signatureBrad King2017-01-161-1/+1
| | | | | | | | | | | | | | | | | | ``` warning: the specified comparator type does not provide a const call operator [-Wuser-defined-warnings] ``` Reported-by: Sean McBride <sean@rogue-research.com>
* | Merge topic 'update-kwsys'Brad King2017-01-173-7/+60
|\ \ | | | | | | | | | | | | | | | ee77941a Merge branch 'upstream-KWSys' into update-kwsys 219c7bdc KWSys 2017-01-16 (a423d829)
| * | Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-01-163-7/+60
| |/ | | | | | | | | * upstream-KWSys: KWSys 2017-01-16 (a423d829)
* | Merge topic 'fixtureUnusedOrdering'Brad King2017-01-171-22/+60
|\ \ | | | | | | | | | | | | 298b5b31 CTest: Ensure setup/cleanup ordering even when fixture not required
| * | CTest: Ensure setup/cleanup ordering even when fixture not requiredCraig Scott2017-01-161-22/+60
| | | | | | | | | | | | Closes: #16558
* | | Merge topic 'file-GLOB-empty-no-crash'Brad King2017-01-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 2bba0bfc file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES
| * | | file: Fix crash on GLOB with no expressions after LIST_DIRECTORIESBrad King2017-01-161-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~318^2~1 (file: Teach GLOB to list directories optionally, 2015-03-17) using `LIST_DIRECTORIES` followed by no expression causes a crash. Fix the logic to avoid the crash. Fixes: #16565
* | | Merge topic 'expand_custom_commands'Brad King2017-01-178-25/+85
|\ \ \ | | | | | | | | | | | | | | | | 7c8ab7dd add_custom_{command,target}: Add COMMAND_EXPAND_LISTS option
| * | | add_custom_{command,target}: Add COMMAND_EXPAND_LISTS optionEd Branch2017-01-148-25/+85
| | | | | | | | | | | | | | | | | | | | | | | | This option allows lists generated by generator expressions to be expanded. Closes: #15935
* | | | CMake Nightly Date StampKitware Robot2017-01-171-1/+1
| |_|/ |/| |
* | | Merge topic 'source_group-tree'Brad King2017-01-162-0/+171
|\ \ \ | | | | | | | | | | | | | | | | b42330be source_group: Add options create groups matching directory tree
| * | | source_group: Add options create groups matching directory treeMateusz Janek2017-01-162-0/+171
| | | | | | | | | | | | | | | | Add `TREE` and `PREFIX` arguments to enable this behavior.
* | | | Merge topic 'csharp_simple'Brad King2017-01-162-71/+364
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 397b8546 VS: added documentation for C# support a7dd8e66 VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015) 6fda6005 VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPS
| * | | | VS: added support for C# (for Visual Studio 2010, 2012, 2013, 2015)Michael Stürmer2017-01-132-69/+363
| | | | |
| * | | | VS: renamed target property VS_USER_PROPS_CXX to VS_USER_PROPSMichael Stürmer2017-01-131-2/+1
| | |_|/ | |/| |
* | | | Merge topic 'Autogen_Config'Brad King2017-01-163-340/+451
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb670d96 Autogen: Generators: Remove space 3f86032b Autogen: Generators: Rename requiresMocing method f24e1d37 Autogen: Generators: Fix clang-tidy readability-else-after-return f27c5852 Autogen: Initializer: Add old settings file to clean files d7d2cb48 Autogen: Generators: Save the UIC/RCC settings that were actually used 721997a7 Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCC 9f47d326 Autogen: Generators: Save the MOC settings that were actually used 597124ba Autogen: Generators: Add function to read makefile definitions config aware 2b400b24 Autogen: Generators: Move moc/uic/rcc executable test to generate method edf0b8a5 Autogen: Generators: Rename GenerateFoo methods to FooGenerate 06430919 Autogen: Generators: Use FileAbsentOrOlder for UIC tests ca179f2a Autogen: Generators: Use FileAbsentOrOlder for MOC tests 119791ae Autogen: Generators: Introduce FileAbsentOrOlder function 95e4cfc5 Autogen: Generators: Simplify (and fix) JoinExts function 6c55755b Autogen: Generators: Make class static method a source static function 1491ab1c Autogen: Generators: Make class static method a source static function ...
| * | | | Autogen: Generators: Remove spaceSebastian Holtermann2017-01-121-1/+0
| | | | |
| * | | | Autogen: Generators: Rename requiresMocing methodSebastian Holtermann2017-01-122-5/+5
| | | | |
| * | | | Autogen: Generators: Fix clang-tidy readability-else-after-returnSebastian Holtermann2017-01-121-5/+5
| | | | |
| * | | | Autogen: Initializer: Add old settings file to clean filesSebastian Holtermann2017-01-121-0/+8
| | | | |
| * | | | Autogen: Generators: Save the UIC/RCC settings that were actually usedSebastian Holtermann2017-01-122-31/+118
| | | | |
| * | | | Autogen: Generators: Dedicated generateAll variables for MOC/UIC/RCCSebastian Holtermann2017-01-122-7/+11
| | | | |
| * | | | Autogen: Generators: Save the MOC settings that were actually usedSebastian Holtermann2017-01-122-52/+59
| | | | |
| * | | | Autogen: Generators: Add function to read makefile definitions config awareSebastian Holtermann2017-01-121-57/+47
| | | | |
| * | | | Autogen: Generators: Move moc/uic/rcc executable test to generate methodSebastian Holtermann2017-01-121-12/+18
| | | | |
| * | | | Autogen: Generators: Rename GenerateFoo methods to FooGenerateSebastian Holtermann2017-01-122-29/+30
| | | | |
| * | | | Autogen: Generators: Use FileAbsentOrOlder for UIC testsSebastian Holtermann2017-01-121-4/+6
| | | | |
| * | | | Autogen: Generators: Use FileAbsentOrOlder for MOC testsSebastian Holtermann2017-01-121-4/+7
| | | | |
| * | | | Autogen: Generators: Introduce FileAbsentOrOlder functionSebastian Holtermann2017-01-122-26/+30
| | | | |
| * | | | Autogen: Generators: Simplify (and fix) JoinExts functionSebastian Holtermann2017-01-121-11/+9
| | | | |
| * | | | Autogen: Generators: Make class static method a source static functionSebastian Holtermann2017-01-122-21/+20
| | | | |
| * | | | Autogen: Generators: Make class static method a source static functionSebastian Holtermann2017-01-122-39/+35
| | | | |
| * | | | Autogen: Generators: Static function upper case renameSebastian Holtermann2017-01-121-3/+3
| | | | |
| * | | | Autogen: Generators: Static function upper case renameSebastian Holtermann2017-01-121-3/+3
| | | | |
| * | | | Autogen: Generators: Sort methods by taskSebastian Holtermann2017-01-122-150/+157
| | | | |
* | | | | Merge topic 'fast-local-and-strip-install'Brad King2017-01-161-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1b63ce86 Makefiles: Make fast local and strip install truly fast
| * | | | | Makefiles: Make fast local and strip install truly fastMike Gelfand2017-01-131-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Makefiles generator, `install/local/fast` and `install/strip/fast` targets are not at all fast. They depend on `install/local` and `install/strip` targets respectively instead of `preinstall/fast` and don't contain any commands instead of repeating commands in `install/local` and `install/strip`. The issue was introduced by simple typos in commits v2.6.0~2825 (Adding install/local global target for Makefile generators, 2006-08-29) and v2.6.0~1743 (add install/strip target for makefile generators, 2007-05-18).
* | | | | Merge topic 'cuda-no-def-file-for-device'Brad King2017-01-162-10/+0
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 05dbc940 CUDA: Don't use module definition `.def` files for device linking
| * | | | | CUDA: Don't use module definition `.def` files for device linkingRobert Maynard2017-01-122-10/+0
| |/ / / / | | | | | | | | | | | | | | | These files are meaningful only to the host linker.
* | | | | Merge topic 'cuda_propagate_flags_when_dlink_on_executables'Brad King2017-01-165-1/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables. dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.
| * | | | | CUDA: Now pass correct FLAGS when device link cuda executables.Robert Maynard2017-01-125-1/+23
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we had a two issues when building cuda executables that required separable compilation. The first was that we didn't propagate FLAGS causing any -arch / -gencode flags to be dropped, and secondly generators such as ninja would use the CXX language flags instead of CUDA when the executable was mixed language.
* | | | | Merge topic 'ninja-no-static-lib-def-file'Brad King2017-01-161-0/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 47ffa0ea Ninja: Do not use module definition `.def` files for static libraries
| * | | | | Ninja: Do not use module definition `.def` files for static librariesBrad King2017-01-121-0/+7
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A module definition (`.def`) file specifies symbols to export from a linked binary. The librarian tool is not a linker and so should not be given a `/DEF:...` flag with the `.def` file. The other generators already do not do this, so fix Ninja to be consistent. Closes: #16537
* | | | | Merge topic 'vs15-detect-from-installer'Brad King2017-01-161-36/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0362c60f cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstance 577f721f VS: Fix detection of VS 2017 installation with WindowsStore
| * | | | | cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstanceBrad King2017-01-121-38/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method short-circuits when an instance has already been chosen, so avoid duplicating this check at call sites.
| * | | | | VS: Fix detection of VS 2017 installation with WindowsStoreBrad King2017-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic in cmVSSetupAPIHelper::IsVS2017Installed to work correctly on repeat calls. Closes: #16549
* | | | | | Merge topic 'usage-cpack-ifw-configure-file'Brad King2017-01-165-15/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49717993 QtIFW: Improved packaging
| * | | | | | QtIFW: Improved packagingKonstantin Podsvirov2017-01-125-15/+19
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now cpack_ifw_configure_file command used to configure template files of component's scripts. Now for these template files we can use QtIFW predefined variables (like @VAR@) and template variables in Qt/IFW/SDK/Creator templates style (like %VAR%). Now CMake_INSTALL_INFIX advanced variable used to configure CMake installation destination when package as part of QtSDK.