summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'loosen-object-deps'Brad King2017-04-2415-24/+171
|\ | | | | | | | | | | | | | | | | | | | | | | | | d96e5d9a Tests: use BYPRODUCTS in the CustomCommandWorkingDirectory test 664591ce RunCMake.Ninja: add a test for assumed sources adf60b28 ninja: break unnecessary target dependencies 01c5bb95 RunCMake.Ninja: support passing arguments when running ninja 7f947b60 ninja: remove duplicate order-only dependencies e9827eba ninja: describe the intermediate order depends target better b57b7d8e Ninja: Order Fortran dyndep file generation explicitly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !430
| * Tests: use BYPRODUCTS in the CustomCommandWorkingDirectory testBen Boeckel2017-04-212-0/+10
| | | | | | | | | | | | | | This was inadvertently testing the assumed sources behavior in Ninja (no other test seems to exercise it). There is now a test explicitly testing it in `RunCMake.Ninja`, so fix this test to work properly regardless of the assumed sources behavior.
| * RunCMake.Ninja: add a test for assumed sourcesBen Boeckel2017-04-212-0/+36
| | | | | | | | | | This is a dark corner of the Ninja generator. It should be fixed in the future, but add a test which shows its behaviors.
| * ninja: break unnecessary target dependenciesBen Boeckel2017-04-2112-24/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, given two libraries, X and Y where X depends on Y, all object compilations of X would require the Y library to have been linked before being compiled. This is not necessary and can instead be loosened such that object compilations of X only depend on the order-only dependencies of Y to be completed. This is to ensure that generated sources, headers, custom commands, etc. are completed before X starts to compile its objects. This should help build performance in projects with many libraries which cause a deep library dependency chain. Previously, a library at the bottom would not start compilation until after all other libraries completed, but now only its link step needs to wait and its compilation jobs can be run in parallel with other tasks. Fixes: #15555
| * RunCMake.Ninja: support passing arguments when running ninjaBen Boeckel2017-04-211-1/+1
| |
| * ninja: remove duplicate order-only dependenciesBen Boeckel2017-04-211-0/+4
| |
| * ninja: describe the intermediate order depends target betterBen Boeckel2017-04-211-1/+1
| | | | | | | | This is only used for compiled objects, so indicate it as such.
| * Ninja: Order Fortran dyndep file generation explicitlyBrad King2017-04-211-0/+11
| | | | | | | | | | | | | | | | | | Each target's dyndep file generation depends on loading information generated by the same step in its dependencies. Add an explicit ordering dependency to ensure the needed information is available. Without the explicit ordering dependency we were abusing the more general target ordering rules through the preprocessor rules generating the `.ddi` files used as input to dyndep file generation.
* | Merge topic 'clang-tidy'Brad King2017-04-2419-105/+96
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 73020305 clang-tidy: avoid copy b432e933 clang-tidy: use .empty() to check emptyness 012972a9 clang-tidy: remove reduntant .data() calls b26577c9 clang-tidy: remove else after break and continue Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !734
| * | clang-tidy: avoid copyDaniel Pfeifer2017-04-212-3/+4
| | |
| * | clang-tidy: use .empty() to check emptynessDaniel Pfeifer2017-04-211-1/+1
| | |
| * | clang-tidy: remove reduntant .data() callsDaniel Pfeifer2017-04-212-18/+13
| | |
| * | clang-tidy: remove else after break and continueDaniel Pfeifer2017-04-2114-83/+78
| | |
* | | CMake Nightly Date StampKitware Robot2017-04-241-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2017-04-231-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2017-04-221-1/+1
| | |
* | | Merge branch 'release'Brad King2017-04-210-0/+0
|\ \ \
| * \ \ Merge branch 'cpack-rpm-buildrequires-docs' into releaseBrad King2017-04-201-0/+13
| |\ \ \
| * \ \ \ Merge branch 'fix-vs2017-guid-braces' into releaseBrad King2017-04-201-7/+2
| |\ \ \ \
* | \ \ \ \ Merge topic 'enable_ptx_compilation'Brad King2017-04-2120-11/+231
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23691d78 CUDA: Allow sources to be compiled to .ptx files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !725
| * | | | | CUDA: Allow sources to be compiled to .ptx filesRobert Maynard2017-04-2020-11/+231
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the target property `CUDA_PTX_COMPILATION` is enabled CUDA OBJECT libraries will generate ptx files instead of object files.
* | | | | | Merge topic 'cpack-rpm-buildrequires-docs'Brad King2017-04-211-0/+13
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b3693e4 CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !730
| * | | | | CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docsDomen Vrankar2017-04-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Missing documentation for an already existing CPackRPM source rpm packages feature. Fixes #16814
* | | | | | Merge topic 'kwsys-import-cleanup'Brad King2017-04-212-10/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93219c40 Merge branch 'upstream-KWSys' into kwsys-import-cleanup 22729eae KWSys 2017-04-20 (8785f84f) d88a511d kwsys: match upstream changes a139b81a update-kwsys: apply changes made in CMake to the import e832c32c kwsys: remove extra attribute Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Brad King <brad.king@kitware.com> Merge-request: !728
| * \ \ \ \ \ Merge branch 'upstream-KWSys' into kwsys-import-cleanupBen Boeckel2017-04-200-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-04-20 (8785f84f)
| | * | | | | | KWSys 2017-04-20 (8785f84f)KWSys Upstream2017-04-202-18/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 8785f84f4760da060cdb2499155bb39532f8c053 (master). Upstream Shortlog ----------------- Ben Boeckel (2): ac0c67d2 gitattributes: indicate attributes to ignore when importing 3dfeb55e gitattributes: rename the c-style attribute
| * | | | | | | kwsys: match upstream changesBen Boeckel2017-04-201-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the import to merge cleanly.
| * | | | | | | update-kwsys: apply changes made in CMake to the importBen Boeckel2017-04-201-1/+2
| | | | | | | |
| * | | | | | | kwsys: remove extra attributeBen Boeckel2017-04-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is set in `Source/.gitattributes` already and does not need to be set inside of the import.
* | | | | | | | Merge topic 'GNUInstallDirs-add-RUNSTATEDIR'Brad King2017-04-216-18/+35
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40814a7c GNUInstallDirs: Add RUNSTATEDIR variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !706
| * | | | | | | | GNUInstallDirs: Add RUNSTATEDIR variableFelix Geyer2017-04-206-18/+35
| | | | | | | | |
* | | | | | | | | Merge topic 'fix-vs2017-guid-braces'Brad King2017-04-211-7/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd7e8f33 VS: Fix project reference inspection in VS IDE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !727
| * | | | | | | | VS: Fix project reference inspection in VS IDERichard Walters2017-04-201-7/+2
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The braces around project reference GUIDs for vcxproj projects were apparently optional in the past, but Visual Studio 2017 is more strict, displaying a warning, and not displaying project reference properties unless the braces are present. Fixes: #16820
* | | | | | | | Merge topic '16760-refactor-get-mac-content-directory'Brad King2017-04-2120-210/+329
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cf320f7c Replace boolean `implib` parameters with enum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !662
| * | | | | | | | Replace boolean `implib` parameters with enumGregor Jasny2017-04-2020-210/+329
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Named enumeration values are much clearer at call sites and add more type safety.
* | | | | | | | Merge topic 'unified-commandline-length'Brad King2017-04-215-55/+50
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bbb5c3ef Ninja,Makefile: Unify command line limit logic Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !705
| * | | | | | | | Ninja,Makefile: Unify command line limit logicChristian Pfeiffer2017-04-195-55/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the logic to cmSystemTools to be shared among the generators. Revise the implementation and add comments justifying each possible source for a limit.
* | | | | | | | | Merge topic 'FindwxWidgets-verify-wx-config'Brad King2017-04-211-0/+22
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8b77084 FindwxWidgets: Verify existence of libraries reported by wx-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !704
| * | | | | | | | | FindwxWidgets: Verify existence of libraries reported by wx-configJan Mrázek2017-04-201-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the Ubuntu package `libwxgtk3-dev` is not installed, FindwxWidgets succeeds even the required libraries are not actually found. The reason for that is that `wx-config` does not perform any kind of check and uses hard-coded values. This affects e.g. KiCAD build process and makes it fail with a confusing error message [1]. The solution is to check for presence of every library file obtained from `wx-config`. [1] https://bugs.launchpad.net/kicad/+bug/1630020
* | | | | | | | | | Merge topic '16795-xcode-system-header-search-paths'Brad King2017-04-211-4/+33
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ffdde4a9 Xcode: Use SYSTEM_HEADER_SEARCH_PATHS attribute for system includes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !726
| * | | | | | | | | | Xcode: Use SYSTEM_HEADER_SEARCH_PATHS attribute for system includesGregor Jasny2017-04-191-4/+33
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #16795
* | | | | | | | | | Merge topic 'autogen-fixes'Brad King2017-04-216-5/+111
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09035319 Autogen: Pass explicit predefines header to moc if possible Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !671
| * | | | | | | | | Autogen: Pass explicit predefines header to moc if possibleAleix Pol2017-04-206-5/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt is relying on whoever calls moc to include a file with the predefined values that will be used by the compiler, otherwise moc takes wrong paths and weird things happen. Instead, generate an include file and feed it to all mocs to make sure it's generating correct code. Co-Author: Sebastian Holtermann <sebholt@xwmw.org> Fixes: #16640
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-04-211-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | Merge branch 'release'Brad King2017-04-200-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'FindBoost-fix-backslash-tolerance' into releaseBrad King2017-04-191-2/+3
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindOpenSSL-more-precompiled' into releaseBrad King2017-04-191-0/+4
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'remove-vs7.1-generator'Brad King2017-04-2042-246/+47
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c94f1bcf Drop Visual Studio 7 .NET 2003 generator a4452fd8 cmGlobalVisualStudioGenerator: Drop VS7 enumeration value 6e66fe5f cmGlobalVisualStudio8Generator: Drop unused GetDocumentation method Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !723
| * | | | | | | | | | | Drop Visual Studio 7 .NET 2003 generatorBrad King2017-04-1939-231/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.6. Remove it.
| * | | | | | | | | | | cmGlobalVisualStudioGenerator: Drop VS7 enumeration valueBrad King2017-04-194-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We no longer support the VS 7.0 (.NET 2002) IDE, so drop the enumeration value corresponding to its version.