mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-28 09:58:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
41,624 Commits 2 Branches 390 Tags
dea01ac30a00ddf495eda3b60f3818f2340d8fba
Commit Graph

41624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
dea01ac30a CMake Nightly Date Stamp 2018-12-13 00:01:05 -05:00
Brad King
6a6900f616 Merge topic 'object-library-link' 
bab24e782c target_link_libraries: Propagate dependencies of object libraries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2725
 2018-12-12 08:32:17 -05:00
Brad King
71e74b4ae4 Merge topic 'fix-configure-line-number' 
fe9a16c80f cmMakefile: Fix @CMAKE_CURRENT_LIST_LINE@ for ExpandVariablesInStringNew
dda4755b46 cmMakefile: Fix ConfigureString not passing filename and line

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2675
 2018-12-12 08:30:45 -05:00
Artur Ryt
fe9a16c80f cmMakefile: Fix @CMAKE_CURRENT_LIST_LINE@ for ExpandVariablesInStringNew 
Added check for variable name in @@ evaluation and test for
configuring @CMAKE_CURRENT_LIST_LINE@ with new CMP0053

Fixes: #18646
 2018-12-12 08:29:14 -05:00
Artur Ryt
dda4755b46 cmMakefile: Fix ConfigureString not passing filename and line 
It enables to use CMAKE_CURRENT_LIST_LINE in string(CONFIGURE)
Added tests for it for ${} and @@ notattion for old CMP0053
and ${} for new
 2018-12-12 08:29:01 -05:00
Brad King
a23ac516b3 Merge topic 'machoFormat' 
c86e82c092 Add Mach-O CMAKE_EXECUTABLE_FORMAT detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2722
 2018-12-12 08:25:04 -05:00
Brad King
4a5e003d4c Merge topic 'FindThreads-drop-irix' 
83dab0c123 FindThreads: Drop IRIX-specific options and results

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2717
 2018-12-12 08:24:10 -05:00
Brad King
287bf93a11 Merge topic 'vs_conformance_mode_flags' 
e0d6d01e52 VS: Add flag table entry for "permissive" flag to disable conformance mode

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2723
 2018-12-12 08:23:26 -05:00
Brad King
abccf484e3 Merge topic 'default-test-timeout' 
3e0eb3307f Help: clarify documentation of ctest --timeout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2721
 2018-12-12 08:20:43 -05:00
Brad King
ed5087e32c Merge topic 'output-converter-simplify' 
33f08eec18 cmOutputConverter: Moved ContainedInDirectory to cmStateDirectory
87e810f223 cmOutputConverter: Moved ForceToRelativePath to cmSystem

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2665
 2018-12-12 08:19:49 -05:00
Kitware Robot
c337b2a0b4 CMake Nightly Date Stamp 2018-12-12 00:01:03 -05:00
Kitware Robot
cb995ddea2 CMake Nightly Date Stamp 2018-12-11 00:01:07 -05:00
Kyle Edwards
bab24e782c target_link_libraries: Propagate dependencies of object libraries 
Prior to this commit, linking against an object library did not
propagate private link dependencies of object libraries to their
consuming targets. This change implements the correct behavior.

Fixes: #18692
Co-Author: Brad King <brad.king@kitware.com>
 2018-12-10 14:57:28 -05:00
Maikel van den Hurk
c86e82c092 Add Mach-O CMAKE_EXECUTABLE_FORMAT detection 
Code for this was prototyped when ELF detection was added long ago but
left commented out.  Use either MH_MAGIC or MH_CIGAM for the 32-bit
variant and use either or MH_MAGIC_64 or MH_CIGAM_64 for the 64-bit
variant.
 2018-12-10 14:41:42 -05:00
Jonathan Storey
e0d6d01e52 VS: Add flag table entry for "permissive" flag to disable conformance mode 
This flag is required to disable conformance mode on specific sources
when it is otherwise enabled on most sources.
 2018-12-10 16:59:19 +00:00
Brad King
8c7367e3f0 Merge branch 'release-3.13' 2018-12-10 09:21:47 -05:00
Brad King
a2f9167c5d Merge topic 'cuda-arch-turing' 
7a5a8eb0c5 CUDA: Add CUDA 10 (Turing) detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2724
 2018-12-10 09:21:26 -05:00
Brad King
78e72efc9c Merge branch 'cuda-arch-turing' into release-3.13 
Merge-request: !2724
 2018-12-10 09:20:50 -05:00
Anton Chernov
7a5a8eb0c5 CUDA: Add CUDA 10 (Turing) detection 2018-12-10 09:15:58 -05:00
Brad King
0f7cca1dae Merge topic 'autogen-cleanups' 
7630eb1975 cmQtAutoGenInitializer: Reduce code duplication

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Tobias Hunger <tobias.hunger@gmail.com>
Merge-request: !2689
 2018-12-10 08:26:05 -05:00
Brad King
2e2455cbd3 Merge topic 'ninja-win-long-commands' 
cfd808ff19 cmLocalNinjaGenerator: Prevent echoing of lines in ninja generated batch files
2c3f2dfa5a cmLocalNinjaGenerator: Report line of failure in ninja generated batch file
2295040e85 cmLocalNinjaGenerator: Propagate failures from batch file back to ninja

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2701
 2018-12-10 08:25:03 -05:00
Brad King
d3983f7fc6 Merge topic 'SWIG' 
dff28141dc UseSWIG: add management of SWIG option -module
7b3d4799f8 Help: update policy 0078 documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2669
 2018-12-10 08:23:42 -05:00
Brad King
45c5958e36 Merge topic 'cuda-arch-turing' 
0f9533e61b CUDA: Add CUDA 10 (Turing) detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Henry Schreiner <henryschreineriii@gmail.com>
Merge-request: !2702
 2018-12-10 08:22:20 -05:00
Brad King
0bfe96a8c3 Merge topic 'file-read_symlink' 
31840e363f file: Fix formatting of error in SIZE sub-command
98a39be6cf file: Add READ_SYMLINK sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2705
 2018-12-10 08:21:40 -05:00
Brad King
e1db7aac30 Merge branch 'release-3.13' 2018-12-10 08:20:10 -05:00
Brad King
d99e1cca20 Merge topic 'cpack-status-callback' 
4a3ae1710e CPack/External: Fix status messages of staging scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2696
 2018-12-10 08:17:06 -05:00
Brad King
5f3b067bee Merge topic 'autogen_revert_implicit_includes' 
e5a4007a3b Merge branch 'backport-autogen_revert_implicit_includes'
4be7f38d57 Autogen: Revert passing compiler implicit includes to moc
187481d4d9 Autogen: Revert passing compiler implicit includes to moc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2709
 2018-12-10 08:16:20 -05:00
Kitware Robot
4b513c0ca3 CMake Nightly Date Stamp 2018-12-10 00:01:04 -05:00
Regina Pfeifer
3e0eb3307f Help: clarify documentation of ctest --timeout 2018-12-09 22:10:31 +01:00
Kitware Robot
dd8c575932 CMake Nightly Date Stamp 2018-12-09 00:01:03 -05:00
Bruno Manganelli
33f08eec18 cmOutputConverter: Moved ContainedInDirectory to cmStateDirectory 2018-12-08 11:24:06 +00:00
Kitware Robot
0021d03153 CMake Nightly Date Stamp 2018-12-08 00:01:05 -05:00
Bruno Manganelli
87e810f223 cmOutputConverter: Moved ForceToRelativePath to cmSystem 2018-12-07 19:29:30 +00:00
Tobias Hunger
7630eb1975 cmQtAutoGenInitializer: Reduce code duplication 
Do not repeat the code used to find uic/rcc and moc exectuables.
 2018-12-07 13:44:33 -05:00
Brad King
83dab0c123 FindThreads: Drop IRIX-specific options and results 
We do not need to support IRIX anymore, so drop relevant parts.  In
particular, the `CMAKE_THREAD_PREFER_PTHREAD` is frequently confused
with `THREADS_PREFER_PTHREAD_FLAG`.

Also remove references to the IRIX-specific options and results
from other modules and tests.
 2018-12-07 13:33:01 -05:00
Marc Chevrier
dff28141dc UseSWIG: add management of SWIG option -module 
When file property SWIG_MODULE_NAME is specified, provide option -module
to SWIG compiler.

Fixes: #18374
 2018-12-07 18:51:57 +01:00
Anton Chernov
0f9533e61b CUDA: Add CUDA 10 (Turing) detection 2018-12-07 08:51:57 -05:00
Brad King
99a224e3ee Merge topic 'vs-json-flag-table' 
8107508b3e Remove old flag table headers
6d855fbf44 Replace header flag tables with json reading
9c60ae5f11 VS: Add flag table entry for -JMC
584ad067ba VS: Fix flag table entry for -Qspectre
8df25f9400 VS: connect /Y- compiler option with "Not Using Precompiled Headers"
f1223e34c6 VS: Add v140 flag table entries for `-Zc:inline[-]`
efc90eed77 VS: Fix regressed mapping for the cl `/Os` compiler flag
36b7fc7db6 VS 14: Add flag map for -std= to CppLanguageStandard tag in project files
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2611
 2018-12-07 08:37:14 -05:00
Brad King
ce1ac9b92d Merge topic 'gnu-octave' 
170bcb6fdc FindOctave: Add module to find GNU octave

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2630
 2018-12-07 08:35:37 -05:00
Brad King
cb85bb3573 Merge topic 'pkg-clang-tidy' 
a816fe298d cmCPackFreeBSDGenerator: fix clang-tidy issues

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2712
 2018-12-07 08:34:46 -05:00
Brad King
2d402239c7 Merge topic 'submit-method' 
9501a6145d CTest: Remove special case for Dart version <= 1
e184603378 CTest: Add release note about removed submission methods
8c25aa2feb CTest: Remove submission trigger
a688c6b928 CTest: Remove submit method 'ftp'
c339b64cf2 CTest: Remove submit method 'scp'
aebdad399e CTest: Remove submit method 'cp'
c2f6872c4e CTest: Remove submit method 'xmlrpc'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2672
 2018-12-07 08:33:46 -05:00
Brad King
049d324e42 Merge topic 'misc-typos' 
8adf237e52 Misc. comment typos

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2703
 2018-12-07 08:32:41 -05:00
Brad King
05f1d7a462 Merge topic 'FindCURL-components' 
5085a984e1 Help: Add notes for topic 'FindCURL-components'
8e5db11fd9 FindCURL: add test for component
fc5afbe970 FindCURL: support COMPONENTS to check features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2677
 2018-12-07 08:31:37 -05:00
Brad King
1cb7ea6113 Merge topic 'cmtarget-remove-unused-classes' 
ecf6fc8dc1 cmTarget: Remove unused classes cmTargetSet and cmTargetManifest

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2697
 2018-12-07 08:30:25 -05:00
Brad King
3454edcd19 Merge topic 'FindHDF5-static-hl' 
4e174e0960 FindHDF5: Fix search for static hdf5_hl on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2700
 2018-12-07 08:29:27 -05:00
Brad King
fdd09a0269 Merge topic 'qnx_compiler_detection' 
243b7c40d4 QNX: Compiler and feature detection fixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: MvdHurk <maikelvandenhurk@hotmail.com>
Merge-request: !2699
 2018-12-07 08:28:13 -05:00
Brad King
e6af2f3d2e Merge topic 'UseEcos-append-flags' 
620e4e5e21 UseEcos: Append C and CXX flags instead of overwriting them

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2684
 2018-12-07 08:26:42 -05:00
Brad King
5651bb0878 Merge topic 'FindThreads-asan' 
e9a1ddc594 FindThreads: Replace the pthread symbol checking in libc.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2629
 2018-12-07 08:25:39 -05:00
Brad King
3b4e86f26d Merge branch 'backport-autogen_revert_implicit_includes' into release-3.13 
Merge-request: !2709
 2018-12-07 08:04:55 -05:00
Brad King
0becea2d60 Merge branch 'cpack-status-callback' into release-3.13 
Merge-request: !2696
 2018-12-07 08:04:21 -05:00