Commit Graph

44807 Commits

Author SHA1 Message Date
Brad King 2c95c35c51 Utilities/Release: Add docker spec for STGZ package on Linux
The spec added by commit facc240a45 (Utilities/Release: Add docker specs
to build and test Linux binaries, 2019-08-23) generates only the TGZ
package, but the old `Utilities/Release/linux64_release.cmake` script
also generated a STGZ package.
2019-08-29 13:04:27 -04:00
Brad King 4929453504 Merge topic 'docker-rel-linux'
689fdbfc61 Utilities/Release: Drop linux64 script in favor of docker build
2d7cfd30ac Utilities/Release: Drop source archive generation in scripts
facc240a45 Utilities/Release: Add docker specs to build and test Linux binaries
bf832ccf01 Utilities/Release: Add README.rst describing directory content
ab153f17bf Utilities/Release: Drop machine-specific README
ed294c1664 Add option to skip CMake tests that need network access
4b8a864d52 Add option to test CMake itself against its hosting CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Gregor Jasny <gjasny@googlemail.com>
Merge-request: !3727
2019-08-29 09:32:13 -04:00
Brad King e009076780 Merge branch 'release-3.15' 2019-08-29 09:25:45 -04:00
Brad King 31c356e366 Merge topic 'find-no-name'
84e33e6da4 Merge branch 'backport-find-no-name' into find-no-name
4c8760c9fb find_path: Fix crash on empty old-style list of names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3751
2019-08-29 09:25:13 -04:00
Kitware Robot 2d0a24acc5 CMake Nightly Date Stamp 2019-08-29 00:01:03 -04:00
Brad King 689fdbfc61 Utilities/Release: Drop linux64 script in favor of docker build
Drop also drop the CMakeNightlyLinux64 test that uses the script.
2019-08-28 13:20:36 -04:00
Brad King 2d7cfd30ac Utilities/Release: Drop source archive generation in scripts
We will generate the `.tar.gz` and `.zip` source archives using
`git archive` in the scripts that drive the Linux build with Docker.
2019-08-28 13:20:36 -04:00
Brad King facc240a45 Utilities/Release: Add docker specs to build and test Linux binaries
These will allow anyone to produce portable binaries like those
published on `cmake.org`.
2019-08-28 13:20:36 -04:00
Brad King 3e93b2fa66 Merge topic 'vs-ConfigurationType-genex'
8909a450a6 VS: Add support for generator expressions to VS_CONFIGURATION_TYPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3746
2019-08-28 11:53:12 -04:00
Brad King ffa1fa20e6 Merge topic 'sf-LANGUAGE-prop'
41ba3e28e6 Tests: Collect SourceFileProperty tests
a40744c81a cmSourceFile: Move LANGUAGE to GetPropertyForUser
8cb3cffa42 cmSourceFile: Rename non-const GetLanguage

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3744
2019-08-28 11:52:04 -04:00
Brad King 606df71e48 Merge topic 'cpack-ifw-command-vectorization'
9367f7dcdd CPack/IFW: Command vectorization

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3732
2019-08-28 11:51:00 -04:00
Brad King ae861c196a Merge topic 'cmCommand_refactor_disallowed'
54872b73b9 cmCommand refactor: remove cmDisallowedCommand class
11f35d340e cmCommand refactor: remove unused AddDisallowedCommand overload
ae51aa32f0 cmCommand refactor: cmVariableRequiresCommand
185fa2c4f3 cmCommand refactor: cmUtilitySourceCommand
c8deeac68f cmCommand refactor: cmSubdirDependsCommand
c2c222eba1 cmCommand refactor: cmOutputRequiredFilesCommand
7533e47ccc cmCommand refactor: cmLoadCommandCommand
9d6fc3f5ed cmCommand refactor: cmExportLibraryDependenciesCommand
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3736
2019-08-28 11:49:32 -04:00
Brad King aeeccc3b15 Merge branch 'backport-find-no-name' into release-3.15
Merge-request: !3751
2019-08-28 11:28:59 -04:00
Brad King 3c7d09e465 Merge branch 'release-3.15' 2019-08-28 11:28:37 -04:00
Brad King 238be91529 Merge topic 'autogen_fix_use_after_move'
e32f70036c Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3745
2019-08-28 11:27:54 -04:00
Brad King 84e33e6da4 Merge branch 'backport-find-no-name' into find-no-name 2019-08-28 11:19:39 -04:00
Brad King 4c8760c9fb find_path: Fix crash on empty old-style list of names
Fixes: #19651
2019-08-28 11:18:53 -04:00
Kitware Robot 96291764a1 CMake Nightly Date Stamp 2019-08-28 00:01:04 -04:00
Tushar Maheshwari 41ba3e28e6 Tests: Collect SourceFileProperty tests
- Move the related test from COnly to SourceFileProperty
- Cover `get_source_file_property` and `get_property(... SOURCE ...)`
2019-08-27 22:28:34 +05:30
Tushar Maheshwari a40744c81a cmSourceFile: Move LANGUAGE to GetPropertyForUser
- Remove the special case from cmGetSourceFilePropertyCommand

Tests: check LANGUAGE for source file
- use target_sources to add file
- use get_property to read property value
2019-08-27 21:41:12 +05:30
Tushar Maheshwari 8cb3cffa42 cmSourceFile: Rename non-const GetLanguage
GetOrDetermineLanguage:
- Read the property if available
- Determine the Language using the file extension

Fix all usage of the non-const member in the repository.
2019-08-27 21:35:42 +05:30
Konstantin Podsvirov 9367f7dcdd CPack/IFW: Command vectorization
Fixes: #19634
2019-08-27 11:30:19 -04:00
Brad King 843ab7544e Merge topic 'cmake-initial-cache-dirs'
4ca0526f8a cmake: Pass -S and -B into PreLoad.cmake and -C scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3709
2019-08-27 11:23:22 -04:00
Brad King 57fc6c587a Merge topic 'xcode11-compatibility'
3186bb91ed Xcode: Make iOS tests compatible with Xcode 11

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3743
2019-08-27 11:00:53 -04:00
Brad King bd4d52f7de Merge topic 'GNUInstallDirs-arch-linux'
18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3735
2019-08-27 10:58:28 -04:00
Brad King 613ac3e7d5 Merge topic 'swift-version'
369c48ee43 Swift: honour `-swift-version` in Ninja generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3685
2019-08-27 10:57:26 -04:00
Brad King d16402ddc4 Merge topic 'ctest-CLICOLOR_FORCE'
074a6a8cf6 CTest: Add env var CLICOLOR_FORCE to force color output

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3733
2019-08-27 10:54:24 -04:00
Peter Waller 4ca0526f8a cmake: Pass -S and -B into PreLoad.cmake and -C scripts
Before this, it was not possible to see what the source or build directories
were set to on the command line.

Fixes: #19619
2019-08-27 10:51:40 -04:00
Brad King 1d953058a2 Merge branch 'autogen_fix_use_after_move' into release-3.15
Merge-request: !3745
2019-08-27 10:25:53 -04:00
Brad King 52a8fb2d53 Merge branch 'release-3.15' 2019-08-27 10:24:57 -04:00
Brad King 4a4001477d Merge topic 'alpine-cpu_zero'
1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3740
2019-08-27 10:20:50 -04:00
Brad King 297df45d00 Merge topic 'cmGlobalGenerator-compilerId-lifetime'
17ce0c29ad cmGlobalGenerator: Fix CheckCompilerIdCompatibility local var lifetime

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3741
2019-08-27 10:18:57 -04:00
Sebastian Holtermann e32f70036c Autogen: Fix AUTOUIC segfault, when file includes colliding ui_*.h file
This fixes a case of use after move of a `std::shared_ptr` in `AUTOUIC`.

It triggered a segfault, when the error message for colliding `ui_*.h`
includes in different files was computed.
2019-08-27 10:17:33 -04:00
Brad King 8a8b2fa695 Merge topic 'libarchive-requirement'
752fa8be9d libarchive: We now require at least version 3.3.3

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3737
2019-08-27 10:17:20 -04:00
Brad King 2a2c4cc722 Merge topic 'ninja_additional_clean_files_custom_target'
d040f3f1ee Tests: Extend MakeClean test to test various target types
3ed8cffe73 Ninja: Add support for ADDITIONAL_CLEAN_FILES in custom targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3739
2019-08-27 10:16:05 -04:00
Brad King 1d68639654 Merge branch 'alpine-cpu_zero' into release-3.15
Merge-request: !3740
2019-08-27 10:11:37 -04:00
Brad King 6157c0fe84 Merge branch 'cmGlobalGenerator-compilerId-lifetime' into release-3.15
Merge-request: !3741
2019-08-27 10:11:29 -04:00
Brad King dd6154ca19 Merge branch 'libarchive-requirement' into release-3.15
Merge-request: !3737
2019-08-27 10:11:16 -04:00
Brad King b0566f62eb Merge branch 'ninja_additional_clean_files_custom_target' into release-3.15
Merge-request: !3739
2019-08-27 10:11:06 -04:00
Brad King 1902e39746 cmAffinity: Add include for CPU_ZERO on Alpine Linux
The definition of `CPU_ZERO` requires `<string.h>` to be included
explicitly for `memset`.  Since IWYU does not agree on other Linux
platforms, use a pragma to silence the warning.

Fixes: #19643
2019-08-27 09:32:32 -04:00
Kitware Robot 65fe80794d CMake Nightly Date Stamp 2019-08-27 00:01:03 -04:00
Gregor Jasny 3186bb91ed Xcode: Make iOS tests compatible with Xcode 11 2019-08-26 21:08:00 +02:00
Gabor Bencze 54872b73b9 cmCommand refactor: remove cmDisallowedCommand class 2019-08-26 11:48:47 -04:00
Gabor Bencze 11f35d340e cmCommand refactor: remove unused AddDisallowedCommand overload 2019-08-26 11:48:47 -04:00
Gabor Bencze ae51aa32f0 cmCommand refactor: cmVariableRequiresCommand 2019-08-26 11:48:46 -04:00
Gabor Bencze 185fa2c4f3 cmCommand refactor: cmUtilitySourceCommand 2019-08-26 11:48:46 -04:00
Gabor Bencze c8deeac68f cmCommand refactor: cmSubdirDependsCommand 2019-08-26 11:48:46 -04:00
Gabor Bencze c2c222eba1 cmCommand refactor: cmOutputRequiredFilesCommand 2019-08-26 11:48:43 -04:00
Saleem Abdulrasool 369c48ee43 Swift: honour -swift-version in Ninja generator
Swift has supported `CMAKE_Swift_LANGUAGE_VERSION` and
`Swift_LANGUAGE_VERSION` but didn't apply that to Ninja generated
targets.  Consider the property when calculating the flags.
2019-08-26 11:38:40 -04:00
Antonio Rojas 18365587c8 GNUInstallDirs: Keep 'lib' as default LIBDIR on Arch Linux based systems
Fixes: #15373
2019-08-26 11:14:13 -04:00