Commit Graph

35680 Commits

Author SHA1 Message Date
Brad King
096c3bacea Merge topic 'vs8-deprecate'
81f9c9e8 Deprecate Visual Studio 8 2005 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !739
2017-04-24 09:36:10 -04:00
Brad King
3ade7a306e Merge topic 'namespace-jar-exports'
0bee0066 Tests: Test namespaces with exported JARs
789c8de3 UseJava: Support namespaced exports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !729
2017-04-24 09:35:29 -04:00
Brad King
aaeb01ef9b Merge topic 'fix-test-all-find-modules'
cda401fe Tests: Simplify CMakeOnly.AllFindModules policy settings
1a2ede17 Tests: Fix FindModulesExecuteAll when KDE4 is installed

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !736
2017-04-24 09:34:03 -04:00
Brad King
1e31359565 Merge topic 'source_group-TREE-alt-root'
d286d24a Merge branch 'backport-source_group-TREE-alt-root' into source_group-TREE-alt-root
1b4d2c74 source_group: Fix TREE with root that is not current source dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !731
2017-04-24 09:33:31 -04:00
Brad King
305e628284 Merge topic 'loosen-object-deps'
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
2017-04-24 09:31:49 -04:00
Brad King
fa338c97d7 Merge topic 'clang-tidy'
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
2017-04-24 09:27:48 -04:00
Kitware Robot
8b0016ab65 CMake Nightly Date Stamp 2017-04-24 00:01:03 -04:00
Kitware Robot
8494aa7adf CMake Nightly Date Stamp 2017-04-23 00:01:02 -04:00
Kitware Robot
e9d1ca782e CMake Nightly Date Stamp 2017-04-22 00:01:05 -04:00
Brad King
d286d24af3 Merge branch 'backport-source_group-TREE-alt-root' into source_group-TREE-alt-root 2017-04-21 15:36:17 -04:00
Mateusz Janek
1b4d2c741a source_group: Fix TREE with root that is not current source dir
Also raise an error if files are given that are not below the root.

Fixes: #16807
2017-04-21 15:31:02 -04:00
Brad King
81f9c9e892 Deprecate Visual Studio 8 2005 generator
Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.
2017-04-21 13:45:45 -04:00
Matthew Woehlke
0bee006602 Tests: Test namespaces with exported JARs 2017-04-21 10:51:09 -04:00
Matthew Woehlke
789c8de3df UseJava: Support namespaced exports
Add NAMESPACE option to export_jars and install_jar_exports. Import
JAR's as imported static libraries rather than custom targets, as this
is necessary to allow the imported targets to contain ':' in their
names. (This also means they won't show up in VS projects, which is more
consistent with other imported targets.) Also, improve the documentation
to be more stylistically consistent with documentation elsewhere.
2017-04-21 10:51:09 -04:00
Brad King
294cf948dc Merge branch 'release' 2017-04-21 10:19:40 -04:00
Brad King
cda401fec4 Tests: Simplify CMakeOnly.AllFindModules policy settings 2017-04-21 10:11:49 -04:00
Brad King
1a2ede1764 Tests: Fix FindModulesExecuteAll when KDE4 is installed
Set `CMP0017` to `NEW` so that when FindKDE4 sets `CMAKE_MODULE_PATH` it
does not break internal dependencies of other find modules.

Fixes: #16823
2017-04-21 10:11:10 -04:00
Brad King
1d8f0f9181 Merge topic 'enable_ptx_compilation'
23691d78 CUDA: Allow sources to be compiled to .ptx files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !725
2017-04-21 08:57:59 -04:00
Ben Boeckel
d96e5d9a19 Tests: use BYPRODUCTS in the CustomCommandWorkingDirectory test
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.
2017-04-21 08:57:40 -04:00
Ben Boeckel
664591ce59 RunCMake.Ninja: add a test for assumed sources
This is a dark corner of the Ninja generator. It should be fixed in the
future, but add a test which shows its behaviors.
2017-04-21 08:57:40 -04:00
Ben Boeckel
adf60b2838 ninja: break unnecessary target dependencies
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
2017-04-21 08:57:40 -04:00
Ben Boeckel
01c5bb9551 RunCMake.Ninja: support passing arguments when running ninja 2017-04-21 08:57:02 -04:00
Ben Boeckel
7f947b602f ninja: remove duplicate order-only dependencies 2017-04-21 08:57:02 -04:00
Ben Boeckel
e9827eba68 ninja: describe the intermediate order depends target better
This is only used for compiled objects, so indicate it as such.
2017-04-21 08:57:02 -04:00
Brad King
b57b7d8e55 Ninja: Order Fortran dyndep file generation explicitly
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.
2017-04-21 08:57:02 -04:00
Brad King
0ad8e4ea65 Merge topic 'cpack-rpm-buildrequires-docs'
8b3693e4 CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !730
2017-04-21 08:56:33 -04:00
Brad King
ecf94cbc51 Merge topic 'kwsys-import-cleanup'
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
2017-04-21 08:56:08 -04:00
Brad King
744f809765 Merge topic 'GNUInstallDirs-add-RUNSTATEDIR'
40814a7c GNUInstallDirs: Add RUNSTATEDIR variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !706
2017-04-21 08:55:31 -04:00
Brad King
59f07efd59 Merge topic 'fix-vs2017-guid-braces'
fd7e8f33 VS: Fix project reference inspection in VS IDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !727
2017-04-21 08:54:38 -04:00
Brad King
5b241d0ae8 Merge topic '16760-refactor-get-mac-content-directory'
cf320f7c Replace boolean `implib` parameters with enum

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !662
2017-04-21 08:53:16 -04:00
Brad King
718daeb4e6 Merge topic 'unified-commandline-length'
bbb5c3ef Ninja,Makefile: Unify command line limit logic

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !705
2017-04-21 08:51:49 -04:00
Brad King
b5a5b227f9 Merge topic 'FindwxWidgets-verify-wx-config'
e8b77084 FindwxWidgets: Verify existence of libraries reported by wx-config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !704
2017-04-21 08:51:21 -04:00
Brad King
bcf066435c Merge topic '16795-xcode-system-header-search-paths'
ffdde4a9 Xcode: Use SYSTEM_HEADER_SEARCH_PATHS attribute for system includes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !726
2017-04-21 08:50:35 -04:00
Brad King
2b7aecba16 Merge topic 'autogen-fixes'
09035319 Autogen: Pass explicit predefines header to moc if possible

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !671
2017-04-21 08:43:43 -04:00
Daniel Pfeifer
73020305af clang-tidy: avoid copy 2017-04-21 10:50:25 +02:00
Daniel Pfeifer
b432e933cb clang-tidy: use .empty() to check emptyness 2017-04-21 10:44:07 +02:00
Daniel Pfeifer
012972a926 clang-tidy: remove reduntant .data() calls 2017-04-21 10:44:07 +02:00
Daniel Pfeifer
b26577c92a clang-tidy: remove else after break and continue 2017-04-21 10:44:07 +02:00
Kitware Robot
1b0c7bca5e CMake Nightly Date Stamp 2017-04-21 00:01:12 -04:00
Brad King
08c99c9253 Merge branch 'cpack-rpm-buildrequires-docs' into release 2017-04-20 16:19:42 -04:00
Domen Vrankar
8b3693e466 CPack/RPM doc: CPACK_RPM_BUILDREQUIRES docs
Missing documentation for an already existing
CPackRPM source rpm packages feature.

Fixes #16814
2017-04-20 16:19:20 -04:00
Ben Boeckel
93219c4003 Merge branch 'upstream-KWSys' into kwsys-import-cleanup
* upstream-KWSys:
  KWSys 2017-04-20 (8785f84f)
2017-04-20 15:35:56 -04:00
KWSys Upstream
22729eae17 KWSys 2017-04-20 (8785f84f)
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
2017-04-20 15:35:56 -04:00
Ben Boeckel
d88a511da3 kwsys: match upstream changes
This allows the import to merge cleanly.
2017-04-20 15:35:39 -04:00
Ben Boeckel
a139b81a52 update-kwsys: apply changes made in CMake to the import 2017-04-20 15:35:17 -04:00
Robert Maynard
23691d789e CUDA: Allow sources to be compiled to .ptx files
When the target property `CUDA_PTX_COMPILATION` is enabled CUDA OBJECT
libraries will generate ptx files instead of object files.
2017-04-20 13:25:38 -04:00
Ben Boeckel
e832c32ca8 kwsys: remove extra attribute
This is set in `Source/.gitattributes` already and does not need to be
set inside of the import.
2017-04-20 12:53:33 -04:00
Felix Geyer
40814a7ce9 GNUInstallDirs: Add RUNSTATEDIR variable 2017-04-20 17:25:46 +02:00
Brad King
59224c3989 Merge branch 'fix-vs2017-guid-braces' into release 2017-04-20 10:31:14 -04:00
Richard Walters
fd7e8f339a VS: Fix project reference inspection in VS IDE
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
2017-04-20 10:30:21 -04:00