reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-04 09:54:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
38,685 Commits 4 Branches 185 Tags 113 MiB
4499cc8bb6
Commit Graph

38685 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
4499cc8bb6 Merge topic 'msvc_cuda_files_use_consistent_obj_names' 
fa583869 CUDA: Use MSVC default pattern for naming object files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1722
 2018-01-31 08:36:24 -05:00
Brad King
a7ee918f19 Merge topic 'generate_speedup' 
aed227fd cmLocalGenerator: change ImportedGeneratorTargets from vector to map
4443adc1 cmLocalGenerator: remove public GetImportedGeneratorTargets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Attila Krasznahorkay <attila.krasznahorkay@gmail.com>
Merge-request: !1717
 2018-01-31 08:34:59 -05:00
Brad King
3fd01be56b Merge topic 'source_group-TREE-args' 
365e02e7 source_group: Fix TREE argument parsing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1713
 2018-01-31 08:34:24 -05:00
Brad King
174693dafe Merge topic 'CheckIPOSupported-doc-Fortran' 
9e341f05 CheckIPOSupported: Document existing Fortran support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1727
 2018-01-31 08:33:29 -05:00
Brad King
0a37b515af Merge topic 'vs-restore-order' 
1fe66c46 VS: Restore the order of the AdditionalIncludeDirectories tag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1719
 2018-01-31 08:33:00 -05:00
Brad King
efa5a26d02 Merge topic 'dedup-ComputeObjectFilenames' 
79f22e84 Makefile,Ninja: De-duplicate ComputeObjectFilenames method

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1715
 2018-01-31 08:32:27 -05:00
Brad King
063684503b Merge topic 'adsp-asmembler-identification' 
f83330ed ASM: ADSP assembler identification

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1723
 2018-01-31 08:31:49 -05:00
Brad King
a50828cc51 Merge topic 'FindCUDA-restore-config-types' 
9f74aaeb FindCUDA: Fix regression in per-config flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1725
 2018-01-31 08:31:06 -05:00
Kitware Robot
f5b5a72096 CMake Nightly Date Stamp 2018-01-31 00:01:06 -05:00
Frank Winklmeier
aed227fd5a cmLocalGenerator: change ImportedGeneratorTargets from vector to map 
For large number of targets significant amount of time is spent in
cmLocalGenerator::FindGeneratorTargetToUse, which uses find_if on a
vector to locate the given target. Using a map instead of vector for
ImportedGeneratorTargets (as done for cmMakefile::ImportedTargets)
provides a significant speedup (up to factor of 2).
 2018-01-30 14:04:37 -05:00
Brad King
9e341f05b0 CheckIPOSupported: Document existing Fortran support 
Support was added by commit v3.9.0-rc1~318^2 (CheckIPOSupported: Add
Fortran support, 2017-04-02) but the documentation was not updated.
 2018-01-30 12:58:41 -05:00
Mateusz Janek
365e02e73e source_group: Fix TREE argument parsing 
Fixes: #17581
 2018-01-30 12:49:26 -05:00
Frank Winklmeier
4443adc1c0 cmLocalGenerator: remove public GetImportedGeneratorTargets 
GetImportedGeneratorTargets is not used anywhere hence remove it
to avoid exposing the type of ImportedGeneratorTargets.
 2018-01-30 17:51:14 +01:00
Robert Maynard
fa583869f7 CUDA: Use MSVC default pattern for naming object files 
The default that CUDA uses causes failures when you try to embed
CUDA obj's into another target.
 2018-01-30 09:14:02 -05:00
Vitaly Stakhovsky
1fe66c462b VS: Restore the order of the AdditionalIncludeDirectories tag 
Move the `AdditionalIncludeDirectories` tag back to the VS-preferred
location in `.vcxproj` files.

Fixes: #17691
 2018-01-30 08:53:04 -05:00
Brad King
142938225e Merge topic 'update_foreach_range_doc' 
7771657c Help: Better explain that foreach(RANGE ) is inclusive.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1716
 2018-01-30 08:48:32 -05:00
Brad King
ed91b81c0d Merge topic 'doc-typo-CMAKE_INCLUDE_CURRENT_DIR' 
99e473ca Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1708
 2018-01-30 08:48:03 -05:00
Brad King
eddea58148 Merge topic 'doc-typo-CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE' 
fc57afde Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1709
 2018-01-30 08:47:18 -05:00
Brad King
e6267df94e Merge topic 'vcxproj-DebugInformationFormat-newline' 
b07b1aa4 VS: Use newline for empty DebugInformationFormat tags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1704
 2018-01-30 08:46:24 -05:00
Brad King
bb35233785 Merge topic 'xcode-gen-warning' 
20ca9d8f cmGlobalXCodeGenerator: Avoid -Wconditional-uninitialized warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sean McBride <sean@rogue-research.com>
Merge-request: !1714
 2018-01-30 08:45:45 -05:00
Brad King
9f74aaeb7d FindCUDA: Fix regression in per-config flags 
Changes in commit 48f7e2d300 (Unhardcode the CMAKE_CONFIGURATION_TYPES
values, 2017-11-27) accidentally left `CUDA_configuration_types`
undefined, but this is used in a few places to handle per-config flags.
Restore it.

Fixes: #17671
 2018-01-30 08:18:11 -05:00
Anton Danielsson
f83330ed6c ASM: ADSP assembler identification 
Add support to identify the ADSP (Analog Devices) assembler
in CMakeDetermineASMCompiler.

Fixes: #17695
 2018-01-30 10:06:01 +01:00
Kitware Robot
c6312835d5 CMake Nightly Date Stamp 2018-01-30 00:01:05 -05:00
Robert Maynard
7771657cd0 Help: Better explain that foreach(RANGE ) is inclusive. 2018-01-29 10:52:14 -05:00
Brad King
79f22e8408 Makefile,Ninja: De-duplicate ComputeObjectFilenames method 
Move the method implementation up to `cmLocalCommonGenerator`
to avoid duplicating it in each generator.
 2018-01-29 10:51:22 -05:00
silvioprog
99e473ca83 Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR docs 2018-01-29 09:42:48 -05:00
silvioprog
fc57afde05 Help: Fix typo in CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE docs 2018-01-29 09:41:37 -05:00
Brad King
20ca9d8f6f cmGlobalXCodeGenerator: Avoid -Wconditional-uninitialized warning 
Clang incorrectly warns about a case where we initialize a variable
inside a condition in such a way that it will always be initialized
before we use it.  Simply initialize the variable when defining it to
silence the warning.
 2018-01-29 09:21:46 -05:00
Brad King
92cd3d0677 Merge topic 'reduce-temporaries' 
c85bb007 Reduce allocation of temporary values on heap.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1698
 2018-01-29 08:05:27 -05:00
Brad King
18153217e2 Merge topic 'ctest_start_function_scope' 
13347740 Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behavior
74092d92 cmCTestScriptHandler: Add new field ShouldRunCurrentScript

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1703
 2018-01-29 08:04:59 -05:00
Brad King
a271286f41 Merge topic 'intel-cxx17-flags' 
c3d576f5 Intel: Add C++17 compiler options
4a5727d3 Intel: Correct the C11 ext flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1711
 2018-01-29 08:04:28 -05:00
Kitware Robot
53f77fad2f CMake Nightly Date Stamp 2018-01-29 00:01:05 -05:00
Kitware Robot
e07cf68f46 CMake Nightly Date Stamp 2018-01-28 00:01:09 -05:00
Christian Pfeiffer
c3d576f5d6 Intel: Add C++17 compiler options 
Since Intel C++ 18.0, some C++17 features are supported if the flags
-std=c++17, respectively /Qstd=c++17 are given.

Fixes: #17687
 2018-01-27 15:09:58 +01:00
Christian Pfeiffer
4a5727d375 Intel: Correct the C11 ext flag 
Intel does not support a 'gnu11' standard flag, only 'c11'.
 2018-01-27 15:08:00 +01:00
Kitware Robot
1d65f68834 CMake Nightly Date Stamp 2018-01-27 00:01:14 -05:00
Robert Dailey
b07b1aa416 VS: Use newline for empty DebugInformationFormat tags 
Previously, code wrote out empty tags for `<DebugInformationFormat>`
like so:

    <DebugInformationFormat></DebugInformationFormat>

This gets corrected by Visual Studio 2017 when saving the solution. The
correction appears as:

    <DebugInformationFormat>
    </DebugInformationFormat>

In the spirit of keeping the XML structure as close to what Visual
Studio expects as possible, a newline is inserted after the opening tag
in the empty case.
 2018-01-26 09:52:59 -06:00
Kyle Edwards
13347740e2 Help: add release notes, documentation for CTEST_RUN_CURRENT_SCRIPT behavior 2018-01-26 09:28:33 -05:00
Kyle Edwards
74092d92bf cmCTestScriptHandler: Add new field ShouldRunCurrentScript 
This is to avoid scope issues with CTEST_RUN_CURRENT_SCRIPT. If
ctest_start() is called within a function scope, the value of
CTEST_RUN_CURRENT_SCRIPT that it sets doesn't make it to the global
scope. With this change, ctest_start() no longer sets
CTEST_RUN_CURRENT_SCRIPT, and instead sets a field directly in
cmCTestScriptHandler. The old behavior of CTEST_RUN_CURRENT_SCRIPT
has also been kept for projects and tests that rely on setting it.
 2018-01-26 09:27:22 -05:00
Brad King
a24dbba348 Merge topic 'test-genex-speedup' 
d71be346 Tests: Speed up RunCMake.TargetPropertyGeneratorExpressions
234a069d Tests: Speed up RunCMake.GeneratorExpression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1701
 2018-01-26 08:28:43 -05:00
Brad King
0e793e7bed Merge topic 'dedup-uv-signal-hack' 
3ec5f7c1 De-duplicate cmUVSignalHackRAII
1ad58d30 cmUVSignalHackRAII: Use nullptr instead of NULL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1699
 2018-01-26 08:28:08 -05:00
Brad King
f343106b19 Merge topic 'ctest-chrono' 
e6a80ccf Make use of std::chrono throughout every component
ff62b005 CTest: add safe conversion from cmDuration to integer types
695951bc CTest: introduce cmDuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1592
 2018-01-26 08:27:37 -05:00
Brad King
b50fb70be8 Merge topic 'update-curl' 
cd8e31a1 Merge branch 'upstream-curl' into update-curl
af9e6540 curl 2018-01-23 (d6c21c8e)
e9c8ea75 curl: Update script to get curl 7.58.0

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1696
 2018-01-26 08:26:57 -05:00
Pavel Solodovnikov
c85bb007df Reduce allocation of temporary values on heap. 
- Use `std::move` while inserting temporary results into vectors.
- Change `push_back` to `emplace_back` where appropriate.
 2018-01-26 13:24:45 +03:00
Kitware Robot
9a52b80d06 CMake Nightly Date Stamp 2018-01-26 00:01:07 -05:00
Brad King
d71be346a4 Tests: Speed up RunCMake.TargetPropertyGeneratorExpressions 
Consolidate similar test cases.
 2018-01-25 12:08:13 -05:00
Brad King
234a069de3 Tests: Speed up RunCMake.GeneratorExpression 
Avoid enabling languages in cases that do not need them.
 2018-01-25 10:50:20 -05:00
Brad King
7c30a3a3c3 Merge topic 'doc-dev-release' 
bb33bb65 Help/dev: Add log step to 'release' branch instructions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1700
 2018-01-25 09:47:45 -05:00
Brad King
bb33bb657e Help/dev: Add log step to 'release' branch instructions 
Extend the maintainer guide with a reminder to self-review the
new ancestry of the `release` and `master` branches to ensure
that nothing unexpected was merged.
 2018-01-25 09:44:36 -05:00
Brad King
3ec5f7c1a2 De-duplicate cmUVSignalHackRAII 
This was added separately in `cmCTestMultiProcessHandler` and
`cmQtAutoGenerator`.  Factor out the duplicate code into a common header
for re-use.
 2018-01-25 09:22:47 -05:00