Commit Graph

35867 Commits

Author SHA1 Message Date
Daniel Pfeifer 377d4df279 QCMakeCacheView: avoid temporary containers for iteration 2017-05-05 09:21:12 +02:00
Daniel Pfeifer a57b30bb60 QtDialog: add missing emit keywords 2017-05-05 09:21:11 +02:00
Daniel Pfeifer 7a0e239240 cmFileMonitor: use cmDeleteAll 2017-05-05 09:21:10 +02:00
Kitware Robot 0e967e3b1d CMake Nightly Date Stamp 2017-05-05 00:01:05 -04:00
Brad King 30cb24f39c Merge topic 'sunpro-5.14'
f15f905b Features: Record standards and features for SunPro 5.14

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !795
2017-05-04 11:33:38 -04:00
Brad King a83250880a Merge topic 'FindOpenCL-AMDAPPSDKROOT'
b888104e FindOpenCL: add AMDAPPSDKROOT into paths for OpenCL library

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !792
2017-05-04 10:31:47 -04:00
Brad King 71595858b8 Merge topic 'cpackifw-part-refactoring'
9c13e8eb CPackIFW: Refactor out some commonly used code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !762
2017-05-04 10:31:29 -04:00
Brad King ef9c9c92f5 Merge topic 'remove-top-level-xcode-groups'
01cd88c0 Xcode: Remove the top-level Sources and Resources groups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !779
2017-05-04 10:31:05 -04:00
Kitware Robot ec526768ac CMake Nightly Date Stamp 2017-05-04 00:01:04 -04:00
Brad King f15f905bab Features: Record standards and features for SunPro 5.14
Oracle Studio 12.5 adds support for C 11 and associated standard flags.
It also adds a few more C++ 11 features.
2017-05-03 13:13:43 -04:00
Jeremy Tellaa b888104e44 FindOpenCL: add AMDAPPSDKROOT into paths for OpenCL library
This path was only looked up for windows.  The AMD SDK also exists for
Linux, and we may want to use the OpenCL library for there.
2017-05-03 11:53:25 -04:00
Konstantin Podsvirov 9c13e8eb6f CPackIFW: Refactor out some commonly used code
Move common used code to new cmCPackIFWCommon base class.
2017-05-03 11:32:05 -04:00
Brad King 84d0841ed7 Merge topic 'update-vim-syntax'
0d8273fa Merge branch 'upstream-vim-cmake-syntax'
e3357711 vim-cmake-syntax 2017-05-02 (15526199)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !789
2017-05-03 11:10:19 -04:00
Matt Stevens 01cd88c0e5 Xcode: Remove the top-level Sources and Resources groups
This addresses duplicate file reference warnings from xcodebuild caused
by the same file reference being a member of both the target's group and
the top-level Resources group. Since resources are already a member of
their associated target's group the top-level Resources group isn't
strictly necessary, and removing it results in a project structure
closer to that of a current Xcode project template.

Fixes: #15272
2017-05-03 11:05:42 -04:00
Brad King 1fe2dc5ef2 Merge topic 'ipo-xcode'
7e75568b Xcode: Support IPO (LTO)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !785
2017-05-03 11:04:17 -04:00
Brad King bf3c08d648 Merge topic 'port-language-default-to-common-macro'
d9089876 AppleClang: Use common compiler macros for language standard default
174c02e1 SunPro: Use common compiler macros for language standard default
08fa2ba8 Clang: Use common compiler macros for language standard default
0198502f Intel: Use common compiler macros for language standard default
d1aa2b3f GNU: Use common compiler macros for language standard default
87b9d6d9 XL: Use common compiler macros for language standard default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !787
2017-05-03 11:01:12 -04:00
Brad King f1e91c694b Merge topic 'fix-typo-in-pgi-files'
0225417f PGI: Fix typo in logic for C standard flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !788
2017-05-03 11:00:51 -04:00
Kitware Robot 9682027954 CMake Nightly Date Stamp 2017-05-03 00:01:21 -04:00
Patrick Boettcher 0d8273fa32 Merge branch 'upstream-vim-cmake-syntax'
* upstream-vim-cmake-syntax:
  vim-cmake-syntax 2017-05-02 (15526199)
2017-05-02 17:34:53 +02:00
vim-cmake-syntax upstream e335771157 vim-cmake-syntax 2017-05-02 (15526199)
Code extracted from:

    https://github.com/pboettch/vim-cmake-syntax.git

at commit 155261999e9affb087e9034ed6009396de6b8f28 (master).

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

Patrick Boettcher (7):
      eb4537d6 no tab in CMake-files
      933b6aea update syntax to cmake-version 3.7.1
      545bddcd fix highlighting of keyword variables in ${}-regions and cleanups
      9c06c8fb README updated
      2ca39d28 make keywords contained, to inhibit highlighting when outside highlighting
      6cb8352f do not highlight strings outside regions
      15526199 update to 3.8.20170502-g7a806
2017-05-02 17:34:33 +02:00
Ruslan Baratov 7e75568b00 Xcode: Support IPO (LTO) 2017-05-02 18:33:25 +03:00
Chuck Atkins 0225417f60 PGI: Fix typo in logic for C standard flags 2017-05-02 10:08:56 -04:00
Brad King 3960038ea2 Merge branch 'release' 2017-05-02 09:53:00 -04:00
Chuck Atkins d908987634 AppleClang: Use common compiler macros for language standard default 2017-05-02 09:49:23 -04:00
Chuck Atkins 174c02e149 SunPro: Use common compiler macros for language standard default 2017-05-02 09:49:23 -04:00
Chuck Atkins 08fa2ba8d0 Clang: Use common compiler macros for language standard default 2017-05-02 09:49:23 -04:00
Chuck Atkins 0198502ff4 Intel: Use common compiler macros for language standard default 2017-05-02 09:49:23 -04:00
Chuck Atkins d1aa2b3f60 GNU: Use common compiler macros for language standard default 2017-05-02 09:49:23 -04:00
Chuck Atkins 87b9d6d93f XL: Use common compiler macros for language standard default 2017-05-02 09:49:23 -04:00
Brad King 8bd6af0d63 CMake 3.8.1 v3.8.1 2017-05-02 08:40:39 -04:00
Brad King ccd7d98b38 Merge branch 'release' 2017-05-02 08:40:02 -04:00
Brad King a9e48968bb Merge topic 'add-language-standards-to-more-compilers'
9b97cb55 PGI: Add language standards for PGI
daae564d Cray: Add language standards for the Cray compiler
25e83ce5 CompileFeatures: Let STD compile options be a list
1de70845 Compilers: Add common macros to be used by various compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !784
2017-05-02 08:24:06 -04:00
Brad King 4804c7f30f Merge topic 'doc-no-depend'
c273906f Utilities/Sphinx: Build documentation independently by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !786
2017-05-02 08:22:47 -04:00
Brad King 8fba1f4a03 Merge topic 'excludeFixtures'
c1b2b7c0 Add ctest options for limiting which tests fixtures add

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !778
2017-05-02 08:22:07 -04:00
Brad King 96a8b68d5a Merge topic 'sunpro-c++11-link'
e17b1791 Features: On SunPro link with language standard compiler flag
d037be12 cmLocalGenerator: Add a hook for compiler flags used at link time
b115bc49 Features: Refactor <LANG>_STANDARD update

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !783
2017-05-02 08:20:38 -04:00
Brad King 737d05b8f8 Merge topic 'update-kwsys'
750d58bf Merge branch 'upstream-KWSys' into update-kwsys
2dec4695 KWSys 2017-05-01 (3ec3252c)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !781
2017-05-02 08:19:39 -04:00
Brad King 96ad8fe608 Merge topic 'FindMatlab-2017a'
6f04dffb FindMatlab: Add support for Matlab 2017a

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !780
2017-05-02 08:18:52 -04:00
Kitware Robot 7a8068fccd CMake Nightly Date Stamp 2017-05-02 00:01:06 -04:00
Chuck Atkins 9b97cb5562 PGI: Add language standards for PGI 2017-05-01 15:15:30 -04:00
Chuck Atkins daae564d87 Cray: Add language standards for the Cray compiler 2017-05-01 15:15:30 -04:00
Chuck Atkins 25e83ce580 CompileFeatures: Let STD compile options be a list 2017-05-01 15:15:29 -04:00
Chuck Atkins 1de7084501 Compilers: Add common macros to be used by various compilers
With numerous compilers now supporting multiple language standards in CMake,
some common design patterns have begun to emerge.  This is intended to
be a collection of macros implementing many of those common design
patterns that can be factored out and leveraged by many compilers.
Currently this only contains the code to set the default language
standard of not preset.  More functionality will be added in the future
as appropriate.
2017-05-01 15:15:23 -04:00
Brad King c273906f48 Utilities/Sphinx: Build documentation independently by default
Previously we made the `documentation` target depend on the executable
targets.  There is no real reason to do this other than serializing the
documentation build output in terminals.  Move this dependency behind an
undocumented option so that it is not on by default.
2017-05-01 13:18:25 -04:00
Craig Scott c1b2b7c03c Add ctest options for limiting which tests fixtures add
The new options allow the user to restrict the setup and cleanup tests
automatically added for fixtures.
2017-05-02 01:54:13 +10:00
Brad King e17b179184 Features: On SunPro link with language standard compiler flag
When C++ feature requirements or `CXX_STANDARD` cause us to compile
on SunPro with the `-std=c++11` option, link with the option too.
This is needed to make the compiler use the matching standard library.
2017-05-01 10:33:06 -04:00
Brad King d037be122e cmLocalGenerator: Add a hook for compiler flags used at link time
When using a compiler to drive linking we add compiler flags from
`CMAKE_<LANG>_FLAGS` in case they affect the way the compiler invokes
the linker, but we don't add flags from other places that are meant only
for compiling sources.  Rather than calling the `AddLanguageFlags`
method (which is used to add flags for compiling sources) directly, add
an intermediate method that is used when adding the flags for linking.
This will give us a way to add language-specific compiler flags needed
when driving the linker in the same place on the command line as other
compiler flags go.
2017-05-01 10:33:05 -04:00
Brad King b115bc49ff Features: Refactor <LANG>_STANDARD update
In order to support generator expressions in target COMPILE_FEATURES
we apply them at generate time.  Move this step to the beginning of
generation instead of doing it on demand while collecting flags.
This avoids repeating the process unnecessarily, and will then allow
`cmLocalGenerator::AddCompilerRequirementFlag` to be used any time
during generation.
2017-05-01 10:33:05 -04:00
Brad King 750d58bf61 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-05-01 (3ec3252c)
2017-05-01 10:25:35 -04:00
KWSys Upstream 2dec4695b7 KWSys 2017-05-01 (3ec3252c)
Code extracted from:

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

at commit 3ec3252c4829f929fff246d0d8757ed71f9850f3 (master).

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

Chuck Atkins (1):
      51e95ba7 XL: Fix compatibility with newer clang-based XL on Linux

Daniel Pfeifer (1):
      2564822b Disable clang-tidy
2017-05-01 10:25:35 -04:00
Brad King 9a88708893 Merge branch 'FindMatlab-2017a' into release 2017-05-01 09:26:38 -04:00