Commit Graph

7715 Commits

Author SHA1 Message Date
Brad King 718f0c24f7 Merge topic 'findjava-openjdk9'
f5a3ec4d FindJava: Add support for OpenJDK early access builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !797
2017-05-05 09:45:30 -04:00
Chuck Atkins 1a09a7d992 SunPro: Add more flags for C language standards 2017-05-04 14:10:07 -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
Bryan Donlan f5a3ec4d76 FindJava: Add support for OpenJDK early access builds
OpenJDK 9 early access builds use a version string of "9-ea", and
locally built installations use "9-internal", neither of which is
currently accepted by the FindJava macro.  Map those versions to "1.9".
If the final released version is "9.0" the version interpretation could
be changed to match at that time.
2017-05-04 10:49:17 -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 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
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
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
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 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 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 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
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 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 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 9a88708893 Merge branch 'FindMatlab-2017a' into release 2017-05-01 09:26:38 -04:00
Raffi Enficiaud 6f04dffb7d FindMatlab: Add support for Matlab 2017a 2017-05-01 09:26:32 -04:00
Brad King a2a13e8b48 Merge topic 'ipo-clang'
7d057b27 Clang IPO (LTO) support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !717
2017-05-01 09:15:46 -04:00
Chuck Atkins 6555286c55 XL: Add C and C++ language level flags 2017-04-28 11:48:32 -04:00
Chuck Atkins 54a4d28dcf XL: Add additional regex for bogus compile options 2017-04-28 11:08:41 -04:00
Ruslan Baratov 7d057b2738 Clang IPO (LTO) support 2017-04-28 17:13:56 +03:00
Brad King 2911d47016 Merge topic 'fix-qhalt-for-xl'
f320907b XL: Fix the use of the -qhalt flag for varying OSs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !771
2017-04-28 09:53:50 -04:00
Brad King b61e9f8382 Merge topic 'FindBoost-compile-features'
4c2ae38b Boost Fiber actually require at least C++11.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !749
2017-04-28 09:52:41 -04:00
Brad King 12512bdb51 Merge topic 'separgs-native'
28d83837 separgs: Use NATIVE_COMMAND where appropriate
2a207aac separgs: Add a NATIVE_COMMAND mode
81841426 separgs: Migrate tests to RunCMake tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !753
2017-04-28 09:52:07 -04:00
Chuck Atkins f320907b3d XL: Fix the use of the -qhalt flag for varying OSs
The valid settings to pass to the IBM XL compiler for the -qhalt flag
vary widely by language and platform.  Based on existing documentation,
the following table shows which error levels are valid to pass to
-qhalt= since -qhalt=e is not always available.

OS       |  xlc  |  xlC  |   xlf   |
---------|-------|------------------
AIX      | iwes  | iw s  | ilwesu  |
BlueGene | iwes  | iwes  | ilwesu  |
OS X     | iwesu | iwesu | ilwesu  |
Linux    |  w    |  w    | ilwesu  |
2017-04-27 13:29:28 -04:00
Brad King f0ae821681 Merge topic 'cpackifw-framework-version'
993ebdc7 CPackIFW: Framework version

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !761
2017-04-27 09:05:03 -04:00
Brad King a7d9666d5d Merge topic 'UseSWIG-fallback-prefix'
8ed66379 UseSWIG: Fall back to empty PREFIX for unknown languages

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !767
2017-04-27 09:03:39 -04:00
Brad King 7c31ac6689 Merge topic 'FindGLUT-optional-deps'
e1b67d03 FindGLUT: Add library dependencies only if they exist

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !765
2017-04-27 08:58:51 -04:00
Christian Pfeiffer 28d8383797 separgs: Use NATIVE_COMMAND where appropriate 2017-04-26 20:34:23 +02:00
Brad King 380232e105 Merge topic 'xctest_static_framework'
bfa92e57 XCTest: Add support for static frameworks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !732
2017-04-26 09:00:20 -04:00
Brad King f03bbc3970 Merge topic 'findopenmp-modernized'
99ac0940 FindOpenMP: Add tests
bb032c1b FindOpenMP: Complete overhaul.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !733
2017-04-26 08:59:02 -04:00
Brad King e1b67d0373 FindGLUT: Add library dependencies only if they exist
Fixes: #14060
2017-04-26 08:14:08 -04:00
Konstantin Podsvirov 993ebdc72d CPackIFW: Framework version
Improved algorithm for finding the version of QtIFW tools.
2017-04-25 21:43:21 +03:00
Guillaume Campagna bfa92e5725 XCTest: Add support for static frameworks
Fixes: #16636
2017-04-25 09:56:34 -04:00
Christian Pfeiffer bb032c1bf5 FindOpenMP: Complete overhaul. 2017-04-25 09:11:55 -04:00
Brad King 8ed663791b UseSWIG: Fall back to empty PREFIX for unknown languages
Teach `SWIG_ADD_LIBRARY` to fall back to an empty library prefix for
languages we don't explicitly define already.

Suggested-by: Alan W. Irwin <irwin@beluga.phys.uvic.ca>
2017-04-25 08:52:14 -04:00
Brad King bc71f940c7 Merge branch 'FindBoost-backport-fixes' into release 2017-04-24 10:54:54 -04:00
Roger Leigh 502608ab21 FindBoost: Support prebuilt Windows binaries from SourceForge
This are searched for in the default installed location
C:/local/boost_${ver}

Cherry picked from commit 862482df27
for backport to CMake 3.8.
2017-04-24 10:52:11 -04:00
Roger Leigh b479429b2c FindBoost: Allow testing for multiple compiler suffixes
This is to permit VS2017 to make use of the vc141 suffix or
fall back to the compatible vc140 to use Boost libraries built
with VS2015.

Cherry picked from commit 3ca6f70f8b
plus a fixup from commit 6115875bf0
for backport to CMake 3.8.
2017-04-24 10:52:01 -04:00
Brad King 92857eef23 FindBoost: Fix library directory for VS 2017
Boost 1.64 now names the library directory `14.1`, not `15.0`.
2017-04-24 10:51:08 -04:00
Brad King dc6632b9da Merge topic 'remove-xcode-2'
7373b389 Xcode: Drop support for Xcode versions below 3
eaf53849 Xcode: Compute version number earlier

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Gregor Jasny <gjasny@googlemail.com>
Merge-request: !737
2017-04-24 09:40:44 -04:00