Rolf Eike Beer
2622bc3f65
Clean up usage of if(... MATCHES regex) followed string(REGEX REPLACE regex)
...
The matches have already been calculated and can simply be taken from
CMAKE_MATCH_n variables. This avoids multiple compilations of the same or very
similar regular expressions.
2014-04-14 18:16:58 +02:00
Brad King
73721c7ce0
CMakeDetermineVSServicePack: Add deprecation diagnostic
...
Warn project developers at runtime that the module should not be used
anymore. Issue the diagnostic only when the project requires a new
enough CMake to use the alternative. Honor the
CMAKE_(ERROR|WARN)_DEPRECATED settings.
2014-04-14 09:31:54 -04:00
Melven Roehrig-Zoellner
856bfe238c
FindMPI: Use compiler implicit link dirs for matching language ( #14870 )
...
Update the logic added by commit 2f9ad7c6 (Fix FindMPI for the intel
compiler on linux, 2012-03-20) to use the implicit link directories for
the current ${lang} instead of hard-coding C or CXX which may not be
enabled. This is necessary for Fortran-only projects.
2014-04-11 09:59:48 -04:00
Brad King
a6fee73dac
Merge topic 'CMakeDetermineVSServicePack-vs-11-update-4'
...
f0de3f80 CMakeDetermineVSServicePack: Add VS 11 update 4
105658df CMakeDetermineVSServicePack: Match versions more robustly
101515b9 CMakeDetermineVSServicePack: Format documentation
2014-04-11 09:13:16 -04:00
Brad King
893843ce21
Merge topic 'Fortran-pgi-intel-arch'
...
eb8cb2c6 Fortran: Detect pointer size on Intel archs with PGI (#14870 )
2014-04-11 09:13:14 -04:00
Brad King
61ac6d6401
Merge topic 'revert-Android-platform'
...
4b31f064 Revert "Modules: Add an Andriod platform file"
2014-04-11 09:13:10 -04:00
Brad King
76425a6219
Merge topic 'rc-windres-with-dot'
...
7147ed5c CMakeRCInformation: Recognize 'windres' tools with '.' in name (#14865 )
db924e00 CMakeRCInformation: Do not mention 'Fortran' in documentation
2014-04-11 09:13:09 -04:00
Brad King
0c08da9912
Merge topic 'watcom-link-quoting'
...
cb9b1e13 Watcom: Use single quote for all file/path items in wlink command
2014-04-11 09:13:07 -04:00
Brad King
1c5871984a
Merge branch 'rc-windres-with-dot' into release
2014-04-11 09:12:00 -04:00
Brad King
7147ed5ce4
CMakeRCInformation: Recognize 'windres' tools with '.' in name ( #14865 )
...
A 64-bit MinGW windres is named "i686-w64-mingw32.shared-windres". The
get_filename_component NAME_WE mode may strip the ".shared-windres" part
and cause the result to no longer contain "windres". Instead, match the
"windres" name in the full CMAKE_RC_COMPILER value first, and use the
get_filename_component code path only for other resource compilers.
2014-04-11 09:10:56 -04:00
Brad King
db924e00b4
CMakeRCInformation: Do not mention 'Fortran' in documentation
...
This module is for the Windows Resource Compiler, not Fortran.
2014-04-11 09:10:56 -04:00
Brad King
a2da465b75
Merge branch 'Fortran-pgi-intel-arch' into release
2014-04-10 12:58:45 -04:00
Brad King
eb8cb2c6c2
Fortran: Detect pointer size on Intel archs with PGI ( #14870 )
...
The PGI compiler does not define __SIZEOF_POINTER__ so use the
__x86_64__ or __i386__ CPU macros to select a pointer size instead.
2014-04-10 12:57:02 -04:00
Brad King
4fd266904c
Merge branch 'CMakeDetermineVSServicePack-vs-11-update-4' into release
2014-04-10 12:49:54 -04:00
Brad King
f0de3f80bb
CMakeDetermineVSServicePack: Add VS 11 update 4
2014-04-10 12:49:14 -04:00
Brad King
105658df02
CMakeDetermineVSServicePack: Match versions more robustly
...
Use the CMAKE_MATCH_* variables to simplify matching logic. Match
either 3 or 4 version components. Do not fail when there are only three
components available.
2014-04-10 12:49:14 -04:00
Brad King
101515b958
CMakeDetermineVSServicePack: Format documentation
...
Also state explicitly that the module is deprecated.
2014-04-10 12:49:14 -04:00
Stephen Kelly
4b31f0649c
Revert "Modules: Add an Andriod platform file"
...
This reverts commit 77f06b145d57c4665ff5d71b89a70c54a009ad14.
It may be re-added in the future when the requirements for that
platform are better known and supported by CMake.
2014-04-10 17:34:41 +02:00
Brad King
2a326fa65f
Merge topic 'ExternalProject_VCS-quiet'
...
2dad1c14 ExternalProject: Find VCS packages quietly
2014-04-10 09:53:07 -04:00
Jiri Malak
cb9b1e13e4
Watcom: Use single quote for all file/path items in wlink command
...
Watcom Linker use single quote if necessary for quoting target name,
libraries names and libraries search path. Object names were already
fixed.
2014-04-08 13:28:54 -04:00
Stephen Kelly
60c0d2dd81
Features: Add cxx_defaulted_move_initializers.
2014-04-08 11:05:58 +02:00
Stephen Kelly
c4e672358c
Features: Add cxx_long_long_type.
2014-04-08 11:05:58 +02:00
Stephen Kelly
dcaafada0e
Features: Add cxx_func_identifier.
2014-04-08 11:05:57 +02:00
Stephen Kelly
251a1f02a0
Features: Add cxx_local_type_template_args.
2014-04-08 11:05:57 +02:00
Stephen Kelly
53fe7773e6
Features: Add cxx_extended_friend_declarations.
2014-04-08 11:05:57 +02:00
Stephen Kelly
16603f7cdb
Features: Add cxx_enum_forward_declarations.
2014-04-08 11:05:57 +02:00
Stephen Kelly
adf22f611e
Features: Add cxx_default_function_template_args.
2014-04-08 11:05:57 +02:00
Stephen Kelly
7b3e8a0534
Features: Add cxx_right_angle_brackets.
2014-04-08 11:05:57 +02:00
Stephen Kelly
9a49fd21be
Features: Add cxx_decltype_incomplete_return_types.
2014-04-08 11:05:57 +02:00
Stephen Kelly
1889045ca6
Features: Add cxx_sizeof_member.
2014-04-08 11:05:57 +02:00
Stephen Kelly
ab455ebafd
Features: Add cxx_thread_local.
2014-04-08 11:05:57 +02:00
Stephen Kelly
300ce2481e
Features: Add cxx_inline_namespaces.
2014-04-08 11:05:57 +02:00
Stephen Kelly
f9d04a96b5
Features: Add cxx_variadic_macros.
2014-04-08 11:05:57 +02:00
Stephen Kelly
3d76656fb3
Features: Add cxx_uniform_initialization.
2014-04-08 11:05:56 +02:00
Stephen Kelly
e74b216c90
Features: Add cxx_generalized_initializers.
2014-04-08 11:05:56 +02:00
Stephen Kelly
ff80c3b420
Features: Add cxx_attributes.
2014-04-08 11:05:56 +02:00
Stephen Kelly
7605fee593
Features: Add cxx_alignof.
2014-04-08 11:05:56 +02:00
Stephen Kelly
e7d6e1f44f
Features: Add cxx_alignas.
...
cxx_alignof will be a separate feature known to CMake, because
both can be implemented with separate backward compatibility
versions.
2014-04-08 11:05:56 +02:00
Stephen Kelly
32c2acd65c
Features: Add cxx_extern_templates.
2014-04-08 11:05:56 +02:00
Stephen Kelly
9064f78b0c
Features: Add cxx_unrestricted_unions.
2014-04-08 11:05:56 +02:00
Stephen Kelly
3322b393a2
Features: Add cxx_unicode_literals.
2014-04-08 11:05:56 +02:00
Stephen Kelly
04c5b99f38
Features: Add cxx_user_literals.
2014-04-08 11:05:56 +02:00
Stephen Kelly
e1e292cd06
Features: Add cxx_alias_templates.
2014-04-08 11:05:56 +02:00
Stephen Kelly
3300f78310
Features: Add cxx_rvalue_references.
2014-04-08 11:05:55 +02:00
Stephen Kelly
b1c5bd5314
Features: Add cxx_reference_qualified_functions.
2014-04-08 11:05:55 +02:00
Stephen Kelly
ea9c445f06
Features: Add cxx_raw_string_literals.
2014-04-08 11:05:55 +02:00
Stephen Kelly
735adf2c94
Features: Add cxx_range_for.
2014-04-08 11:05:55 +02:00
Stephen Kelly
0fa9bbf1fa
Features: Add cxx_nullptr.
2014-04-08 11:05:55 +02:00
Stephen Kelly
8149fc909f
Features: Add cxx_noexcept.
2014-04-08 11:05:55 +02:00
Stephen Kelly
bd2a025eb0
Features: Add cxx_nonstatic_member_init.
2014-04-08 11:05:55 +02:00