mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-30 11:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
37,289 Commits 2 Branches 401 Tags
dd77a2ed4d0760232cf73977be3cb9dfde2dacb4
Commit Graph

37289 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King dd77a2ed4d Merge topic 'libuv-bootstrap' 
714ce728 bootstrap: Make libuv available during bootstrap
6a2d967d bootstrap: Require compiler mode aware of C99 on Solaris

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1131
 2017-09-18 10:08:07 -04:00
Brad King ce4f635409 Merge topic 'cxx11-override' 
98530d3c cm_codecvt: Tell IWYU to keep cmConfigure.h
4e14498f Drop now-unused definition of CM_OVERRIDE
0b33aee4 Use C++11 override instead of CM_OVERRIDE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1265
 2017-09-18 10:06:47 -04:00
Brad King c29e85d009 Merge topic 'test-cleanups' 
7200ab49 Tests: Fix CMake syntax warning in VSGNUFortran test
9da13bc3 Tests: Fix some references to 'cmake' executable
f1f109e9 Tests: Drop tests that have not run for over 10 years

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1270
 2017-09-18 10:06:10 -04:00
Brad King 507a0fd60e Merge branch 'release-3.9' 2017-09-18 09:04:17 -04:00
Brad King ed74d9e2eb Merge topic 'backport-FindBoost-1.65' 
ee1f8903 FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1280
 2017-09-18 09:02:21 -04:00
Brad King d44202ef05 Merge branch 'backport-FindBoost-1.65' into release-3.9 
Merge-request: !1280
 2017-09-18 08:59:30 -04:00
Roger Leigh ee1f890332 FindBoost: Add support for Boost 1.65.0 and 1.65.1 to CMake 3.9 
Backport the changes from commit fa114e7d70 (FindBoost: Add Boost 1.65
dependencies, 2017-08-22) and commit dbba53a5aa (FindBoost: Add version
1.65.1, 2017-09-06) to CMake 3.9.

Fixes: #17289
 2017-09-18 08:57:18 -04:00
Brad King f5338f799d Merge topic 'revert-vim-no-tabs' 
0d543589 vim: Remove default setting of expandtab

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Maurice <m-ou.se@m-ou.se>
Merge-request: !1273
 2017-09-18 08:52:12 -04:00
Brad King c727459da9 Merge branch 'revert-vim-no-tabs' into release-3.9 
Merge-request: !1273
 2017-09-18 08:44:55 -04:00
Maarten de Vries 0d543589b9 vim: Remove default setting of expandtab 
An update from vim-cmake-syntax by commit v3.9.0-rc1~167^2^2
(vim-cmake-syntax 2017-05-02, 2017-05-02) brought in a change to set
`expandtab` in CMake language files.  This should be a per-project or
per-user choice instead, so drop the setting.
 2017-09-18 08:41:53 -04:00
Kitware Robot 14ffd3b7e9 CMake Nightly Date Stamp 2017-09-18 00:01:03 -04:00
Brad King 714ce72882 bootstrap: Make libuv available during bootstrap 
On UNIX, build only the parts of libuv we need for the filesystem,
process, and poll abstractions using the POSIX poll() backend.  This
avoids many platform-specific conditions.  On Windows, build all of
libuv; there are no conditional alternatives anyway.
 2017-09-17 11:10:18 -04:00
Brad King 6a2d967de0 bootstrap: Require compiler mode aware of C99 on Solaris 
On Solaris some system headers included in C with `-D_XOPEN_SOURCE=600`
require C99 support by the compiler.
 2017-09-17 11:10:18 -04:00
Kitware Robot 214d0ce170 CMake Nightly Date Stamp 2017-09-17 00:01:03 -04:00
Kitware Robot db86cf4e7e CMake Nightly Date Stamp 2017-09-16 00:01:03 -04:00
Brad King 98530d3c14 cm_codecvt: Tell IWYU to keep cmConfigure.h 
We no longer need it explicitly for `CM_OVERRIDE`, but we still need to
include it first everywhere.
 2017-09-15 11:41:49 -04:00
Brad King 7200ab491b Tests: Fix CMake syntax warning in VSGNUFortran test 2017-09-15 10:49:42 -04:00
Brad King 9da13bc3f7 Tests: Fix some references to 'cmake' executable 
Use `${CMAKE_CMAKE_COMMAND}` rather than `cmake` or `${CMAKE_COMMAND}`
in order to ensure we always refer to the `cmake` command being tested.
 2017-09-15 10:49:12 -04:00
Brad King 4e14498f4f Drop now-unused definition of CM_OVERRIDE 2017-09-15 10:06:41 -04:00
Brad King 0b33aee48b Use C++11 override instead of CM_OVERRIDE 
We now require C++11 support including `override`.  Drop use of
the old compatibility macro.  Convert references as follows:

    git grep -l CM_OVERRIDE -- '*.h' '*.hxx' '*.cxx' |
      xargs sed -i 's/CM_OVERRIDE/override/g'
 2017-09-15 10:06:41 -04:00
Brad King f1f109e971 Tests: Drop tests that have not run for over 10 years 2017-09-15 08:58:02 -04:00
Brad King c0c5f924fe Merge topic 'refactor-iwyu-code' 
3bbe95f5 Clean up iwyu code to not be one big if statement.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1247
 2017-09-15 08:54:32 -04:00
Brad King 3449c18c36 Merge topic 'findopenmp-components' 
d25f30a6 FindOpenMP: Add support for components
23530151 FindOpenMP: Minor environmental improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1266
 2017-09-15 08:54:03 -04:00
Brad King 188cdb98a7 Merge topic 'codeblocks-exclude-external' 
fb19b778 CodeBlocks: add option to exclude external files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1159
 2017-09-15 08:53:04 -04:00
Brad King 4644ab3995 Merge topic 'ranged-for' 
63f6fd14 Meta: modernize old-fashioned loops to range-based `for` (CTest).

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1262
 2017-09-15 08:51:03 -04:00
Brad King f801ec0cf7 Merge topic 'update-kwsys' 
f02eced5 Merge branch 'upstream-KWSys' into update-kwsys
38b8017f KWSys 2017-09-14 (d85b17e7)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1263
 2017-09-15 08:49:33 -04:00
Brad King ead879df20 Merge topic 'fphsa-fix-version-exact' 
5dc215e0 FPHSA: fix typo in comment
a8f70b32 FPHSA: replace left-over VERSION by _FOUND_VERSION.
549366cb FPHSA: Add (failing) unit test when checking EXACT on full version number

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1259
 2017-09-15 08:42:16 -04:00
Kitware Robot 6b76615c4e CMake Nightly Date Stamp 2017-09-15 00:01:03 -04:00
Brad King 90b931e115 Merge topic 'doc-RunCMake-result' 
a7a6ae5e Tests: Update RunCMake/README.rst to clarify meaning of -result.txt

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1268
 2017-09-14 14:51:05 -04:00
Brad King a7a6ae5edd Tests: Update RunCMake/README.rst to clarify meaning of -result.txt 
The content of `-result.txt` files is a regex, but the documentation
didn't make this clear.

Suggested-by: Deniz Bahadir <dbahadir@benocs.com>
 2017-09-14 14:15:26 -04:00
Christian Pfeiffer d25f30a6f8 FindOpenMP: Add support for components 
Language specific components are added to FindOpenMP to ease consumption
of the module's results.
 2017-09-14 18:11:28 +02:00
Christian Pfeiffer 23530151b2 FindOpenMP: Minor environmental improvements 
A backup flag for Cray compilers was added and the OpenMP 5.0 Preview 1
document was added to the specification map.
 2017-09-14 18:02:50 +02:00
Pavel Solodovnikov 63f6fd144e Meta: modernize old-fashioned loops to range-based for (CTest). 
Changes done via `clang-tidy` with some manual fine-tuning
for the variable naming and `auto` type deduction
where appropriate.
 2017-09-14 16:11:58 +03:00
Brad King f02eced51d Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2017-09-14 (d85b17e7)
 2017-09-14 08:44:26 -04:00
KWSys Upstream 38b8017fa6 KWSys 2017-09-14 (d85b17e7) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit d85b17e7b4a9754dfb4c69906378c77626c16d24 (master).

Upstream Shortlog
-----------------

Brad King (1):
      c8cfe4e0 SystemTools: Drop SplitProgramFromArgs function
 2017-09-14 08:44:25 -04:00
Yves Frederix 5dc215e03b FPHSA: fix typo in comment 2017-09-14 08:21:38 -04:00
Yves Frederix a8f70b32fb FPHSA: replace left-over VERSION by _FOUND_VERSION. 
This was accidentally left out of commit aec27c152e (FPHSA: use more
localized _FOUND_VERSION instead of VERSION, 2017-09-05).

Fixes: #17281
 2017-09-14 08:21:38 -04:00
Yves Frederix 549366cbfc FPHSA: Add (failing) unit test when checking EXACT on full version number 
This test detects a regression introduced by commit aec27c152e (FPHSA:
use more localized _FOUND_VERSION instead of VERSION, 2017-09-05).
 2017-09-14 08:21:22 -04:00
Brad King 0865a24fc1 Merge branch 'release-3.9' 2017-09-14 07:41:02 -04:00
Brad King 01b9d039e7 Merge topic 'get_filename_component-fix-program-split' 
31f73eb1 get_filename_component: Revise PROGRAM/PROGRAM_ARGS split semantics

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1251
 2017-09-14 07:39:24 -04:00
Brad King 9c7bf6974f Merge topic 'remove-nmcl' 
c2cc91a4 Platforms: Remove Windows-NMcl

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1255
 2017-09-14 07:38:29 -04:00
Brad King 5202075c66 Merge topic 'bootstrap-twice-in-source' 
a3deae71 bootstrap: Fix running multiple times in-source

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1258
 2017-09-14 07:37:58 -04:00
Brad King 208ac57531 Merge topic 'vs-fix-config-map' 
64e973e9 Merge branch 'backport-vs-fix-config-map' into vs-fix-config-map
c5b5bb27 VS: Do not consider MAP_IMPORTED_CONFIG_<CONFIG> on non-imported targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1256
 2017-09-14 07:37:16 -04:00
Brad King fda9a94fe6 Merge topic 'autogen-target-depends-fix-3-9-2' 
06c8a37e Merge branch 'backport-autogen-target-depends' into autogen-target-depends-fix-3-9-2
b494308d Autogen: Tests: Backport tests for _autogen target dependencies
d0f15817 Autogen: Backport autogen target dependency as file dependency fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1257
 2017-09-14 07:19:40 -04:00
Alexandr (Sagrer) Gridnev fb19b7789a CodeBlocks: add option to exclude external files 
Add variable `CMAKE_CODEBLOCKS_EXCLUDE_EXTERNAL_FILES` to optionally
exclude files from outside the project root from the project file
written by the CodeBlocks extra generator.  This optionally restores
logic that had been removed by commit v2.8.3~40^2 (CodeBlocks Generator:
Do not omit files in the project file listing, 2010-10-05) in response
to QTCREATORBUG-2250.

Issue: #12110
Fixes: #17188
 2017-09-14 13:21:59 +03:00
Kitware Robot d6b49ee676 CMake Nightly Date Stamp 2017-09-14 00:01:05 -04:00
Craig Scott dd67b65188 Merge topic 'improve-graphviz-doc' 
7ed35aa3 Docs: Improve markup for graphviz related documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1236
 2017-09-13 20:38:40 -04:00
Bill Hoffman 3bbe95f58a Clean up iwyu code to not be one big if statement. 
This commit changes the internal -E__run_iwyu to be -E__run_co_compile. This
is used for co-compile commands. These are tools that want to mirror the
compiler. For each compiler invocation the tool will be invoked first. This
started as a way to implement include what you use (iwyu), but has expanded
to include cpplint, cppcheck and others. Likely there will be more in the
future as well. This commit implements each one in its own function and
provides a way to add additional ones in the future with less work.
 2017-09-13 17:44:49 -04:00
Brad King 06c8a37e58 Merge branch 'backport-autogen-target-depends' into autogen-target-depends-fix-3-9-2 
Use the "ours" merge strategy because we already have equivalent
changes on our side.
 2017-09-13 15:09:36 -04:00
Brad King badc892ff8 Merge branch 'backport-autogen-target-depends' into release-3.9 
Merge-request: !1257
 2017-09-13 15:08:08 -04:00