mirrors/cmake
2
0
Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-09-29 04:09:35 +03:00
Code Activity
47,352 Commits 2 Branches 414 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
28539 Commits
Author SHA1 Message Date
Brad King f8917685f3 Merge topic 'update-kwsys' 
6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys
f9a3f13415 KWSys 2019-08-29 (08f14d96)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3754
 2019-08-30 10:36:07 -04:00
Brad King 1ae24ee108 Merge branch 'fileapi-CMP0037-OLD' into release-3.15 
Merge-request: !3760
 2019-08-30 10:21:29 -04:00
Brad King 9da1c33cf1 fileapi: Fix codemodel v2 target file name for CMP0037 OLD behavior 
With CMP0037 OLD behavior, executable and library target names may
contain a slash.  Avoid constructing file names with slashes.

Fixes: #19653
 2019-08-30 10:20:12 -04:00
Daniel Eiband 10507c6dc0 cmMakefile: Add configurations getter with empty configuration default 2019-08-30 13:52:13 +02:00
Benjamin Wozniak 55b0532128 cuda: Extend vs10 target generator to use custom cuda path 2019-08-30 08:13:58 +02:00
Kitware Robot 8720353d4a CMake Nightly Date Stamp 2019-08-30 00:01:35 -04:00
Daniel Eiband 2d888e3390 cmSourceFile: Rename mutating GetFullPath() overload 
Rename mutating GetFullPath() overload to ResolveFullPath().
 2019-08-29 22:51:58 +02:00
Brad King 6a9de634b2 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2019-08-29 (08f14d96)
 2019-08-29 13:07:11 -04:00
Cristian Adam 8dfeb5d278 Unity build: Add support for Visual Studio generator 
It works as expected in Visual Studio.

Visual Studio 2017 will (partially) benefit from the build in
support for unity builds. The custom unity sources are used, because
the build in support doesn't allow batching of certain number of
files. It can do only batching by directory.
 2019-08-29 16:45:42 +02:00
Cristian Adam 7114c141e2 Unity build: Add support for Ninja and Makefile generators 2019-08-29 16:44:09 +02:00
Brad King 3ec986ce8e Merge topic 'per-lang-link-library-flag' 
79b2824251 Add per-lang variants of CMAKE_LINK_LIBRARY_{FILE_FLAG,SUFFIX}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3747
 2019-08-29 09:41:06 -04:00
Brad King fa36e2151d Merge topic 'precompile-headers' 
8da78d4efe Precompile headers: Update documentation
5772930164 Precompile headers: Add unit tests
519606704e Precompile headers: Add support for Visual Studio generators
28be170fbc Precompile headers: Add support for Xcode generator
b8626261e9 Precompile headers: Add methods to generate PCH sources
375d01c680 PCH: add example/test
9b6797e71d PCH: add target_precompile_headers command
0467a2f91b PCH: add PRECOMPILE_HEADERS to special properties

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Acked-by: Ivan171 <heavenandhell171@gmail.com>
Acked-by: Stanislav Ershov <digital.stream.of.mind@gmail.com>
Acked-by: Steve Mokris <smokris@softpixel.com>
Acked-by: Evgeniy Dushistov <dushistov@mail.ru>
Acked-by: Danila Malyutin <flashmozzg@gmail.com>
Acked-by: Viktor Kirilov <vik.kirilov@gmail.com>
Acked-by: Lucas Zhao <zhaopf6@163.com>
Merge-request: !3553
 2019-08-29 09:38:21 -04:00
Brad King 030570d71f Merge topic 'autogen_strcat' 
32b15d320f Autogen: cmQtAutoMocUic settings hash computation optimizations
b66cd3fe63 Autogen: cmQtAutoMocUic string concatenation cleanups
619a92eacd Autogen: cmQtAutoRcc settings hash computation optimizations
10dc684508 Autogen: cmQtAutoRcc string concatenation cleanups
da6c4b1273 Autogen: cmQtAutoGenInitializer string concatenation cleanups
7a78d15415 Autogen: Let cmQtAutoGenerator::Logger methods accept cm::string_view
c797148e85 Autogen: Use cm::string_view for AUTO{MOC,UIC,RCC} generator names
8586077baa Autogen: Modernize cmQtAutoGen methods using cm::string_view

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3742
 2019-08-29 09:36:36 -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 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
Cristian Adam 519606704e Precompile headers: Add support for Visual Studio generators 
Tested with Visual C++ 2017 on Windows.

Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
 2019-08-28 11:47:51 -04:00
Cristian Adam 28be170fbc Precompile headers: Add support for Xcode generator 
Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
 2019-08-28 11:47:50 -04:00
Cristian Adam b8626261e9 Precompile headers: Add methods to generate PCH sources 
Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
 2019-08-28 11:47:40 -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 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
Alan W. Irwin 79b2824251 Add per-lang variants of CMAKE_LINK_LIBRARY_{FILE_FLAG,SUFFIX} 
Extend the change from commit 689be6235e (Generator: support
per-language link library flag, 2019-08-08) to cover more link library
command-line flag components.  Allow compilers for different languages
to use different values for these linking-related variables within the
same build.

Closes: #19631
 2019-08-27 13:49:54 -04:00
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
Sebastian Holtermann 32b15d320f Autogen: cmQtAutoMocUic settings hash computation optimizations 2019-08-27 17:31:46 +02:00
Sebastian Holtermann b66cd3fe63 Autogen: cmQtAutoMocUic string concatenation cleanups 2019-08-27 17:31:46 +02:00
Sebastian Holtermann 619a92eacd Autogen: cmQtAutoRcc settings hash computation optimizations 2019-08-27 17:31:46 +02:00
Sebastian Holtermann 10dc684508 Autogen: cmQtAutoRcc string concatenation cleanups 2019-08-27 17:31:46 +02:00
Sebastian Holtermann da6c4b1273 Autogen: cmQtAutoGenInitializer string concatenation cleanups 2019-08-27 17:31:46 +02:00
Sebastian Holtermann 7a78d15415 Autogen: Let cmQtAutoGenerator::Logger methods accept cm::string_view 2019-08-27 17:31:45 +02:00
Sebastian Holtermann c797148e85 Autogen: Use cm::string_view for AUTO{MOC,UIC,RCC} generator names 
- Store `AUTO{MOC,UIC,RCC}` generator name as `cm::string_view`
- Use `std::initializer_list` instead of `std::array`
 2019-08-27 17:31:45 +02:00
Sebastian Holtermann 8586077baa Autogen: Modernize cmQtAutoGen methods using cm::string_view 2019-08-27 17:31:45 +02:00
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 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 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 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