Commit Graph

27065 Commits

Author SHA1 Message Date
Peter Wu e1da4dc2dd CheckStructHasMember: fix null deref warning (#15413)
Clang Static Analyzer is so smart that it reports a defect when this
intended null-deref is encountered.  Use sizeof instead which has no
runtime effects.
2015-02-20 11:21:43 -05:00
Brad King 244867369b Merge branch 'release' 2015-02-20 10:54:51 -05:00
Brad King c4c570f9cc Merge topic 'find-command-prefix-from-PATH'
ffc06c12 Teach find_(library|file|path) to get prefixes from PATH (#15370)
2015-02-20 08:10:50 -05:00
Brad King b7351d8e14 Merge topic 'cmake-gui-reset-generator-toolset-and-platform'
1ade687d cmake-gui: Reset generator platform and toolset on configure (#15411)
2015-02-20 08:10:48 -05:00
Kitware Robot 14713eebfb CMake Nightly Date Stamp 2015-02-20 00:01:16 -05:00
Brad King ffc06c1239 Teach find_(library|file|path) to get prefixes from PATH (#15370)
The find_package command already knows how to compute installation
prefixes from PATH.  Use the same approach to establish prefixes for
find_library, find_file, and find_path to use to look in directories
like "<prefix>/lib[/<arch>]" and "<prefix>/include" for libraries and
headers.  This will reduce the amount of configuration end users need to
do to establish a work environment rooted under a specific prefix.
2015-02-19 10:03:17 -05:00
Brad King d5ad641ac3 Merge branch 'release' 2015-02-19 09:35:06 -05:00
Brad King 2f0b9c67fc Merge topic 'CMakeParseImplicitLinkInfo-CMP0054'
d1cf09e3 CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg
2015-02-19 09:32:33 -05:00
Brad King 05c54c5bc7 Merge topic 'mingw-no-find_library-dll'
a0f17fbe Windows-GNU: Do not tell find_library to treat '.dll' as linkable
2015-02-19 09:32:31 -05:00
Brad King 6f9c4d17f8 Merge topic 'compiler-version-Fortran'
4cf3589e Help: Add notes for topic 'compiler-version-Fortran'
f611406f Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)
c6e1f464 Fortran: Detect G95 compiler version
0033faac Fortran: Detect PGI compiler version
302d47b1 Fortran: Detect XL and VisualAge compiler versions
8c8b77a5 Fortran: Detect GNU compiler version
49562a77 Fortran: Detect PathScale compiler version
aa77b631 Fortran: Detect SunPro compiler version
2e09c423 Fortran: Detect Intel compiler version
e6ebc814 Fortran: Add infrastructure to detect compiler version (#15372)
2015-02-19 09:32:29 -05:00
Brad King 49821094fa Merge topic 'binary-release-no-OpenSSL-on-Win-or-OSX'
7e6608fe Utilities/Release: Build OS X and Win binaries without OpenSSL
2015-02-19 09:32:27 -05:00
Brad King d7bc3ff690 Merge topic 'FindJNI-awt-arch'
bce4e20f FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
2015-02-19 09:32:25 -05:00
Brad King 4cf3589ed6 Help: Add notes for topic 'compiler-version-Fortran' 2015-02-19 09:26:29 -05:00
Brad King f611406fe9 Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)
Update the CMakeOnly.CompilerIdFortran test to require that the variable
is set instead of just warning.  We already require it for C and CXX.
2015-02-19 09:26:28 -05:00
Brad King c6e1f46475 Fortran: Detect G95 compiler version
The __G95__ and __G95_MINOR__ preprocessor symbols encode the compiler
version as decimal digits.
2015-02-19 09:26:28 -05:00
Brad King 0033faac1d Fortran: Detect PGI compiler version
Port logic from the "Compiler/PGI-DetermineCompiler" module into
"CMakeFortranCompilerId.F.in".
2015-02-19 09:26:28 -05:00
Brad King 302d47b1fe Fortran: Detect XL and VisualAge compiler versions
Port logic from the "Compiler/XL-*-DetermineCompiler" and
"Compiler/VisualAge-*-DetermineCompiler" modules into
"CMakeFortranCompilerId.F.in".
2015-02-19 09:26:28 -05:00
Brad King 8c8b77a5de Fortran: Detect GNU compiler version
Port logic from the "Compiler/GNU-DetermineCompiler" module into
"CMakeFortranCompilerId.F.in".
2015-02-19 09:26:28 -05:00
Brad King 49562a77f7 Fortran: Detect PathScale compiler version
Port logic from the "Compiler/PathScale-DetermineCompiler" module into
"CMakeFortranCompilerId.F.in".
2015-02-19 09:26:27 -05:00
Brad King aa77b631d9 Fortran: Detect SunPro compiler version
Port logic from "Compiler/SunPro-*DetermineCompiler" modules into
"CMakeFortranCompilerId.F.in".
2015-02-19 09:26:27 -05:00
Brad King 2e09c4230f Fortran: Detect Intel compiler version
Port logic from the "Compiler/Intel-DetermineCompiler" module into
"CMakeFortranCompilerId.F.in".
2015-02-19 09:26:27 -05:00
Brad King e6ebc814df Fortran: Add infrastructure to detect compiler version (#15372)
Fortran does not offer syntax to compose a string literal at
preprocessing time from numeric compuations.  Instead encode each digit
of each component as a separate INFO string and compose them in CMake
code after extraction.  Support MAJOR, MINOR, PATCH, and TWEAK
components with up to 8 digits each.
2015-02-19 09:26:27 -05:00
Brad King 20f64bd2da Merge branch 'cmake-gui-reset-generator-toolset-and-platform' into release 2015-02-19 09:19:57 -05:00
Brad King 1ade687d8d cmake-gui: Reset generator platform and toolset on configure (#15411)
At the start of each configure step we already reset the generator
selection (CMAKE_GENERATOR) to match that loaded for the current
project.  Add missing code to reset the generator platform and toolset
(CMAKE_GENERATOR_PLATFORM and CMAKE_GENERATOR_TOOLSET) also so that they
do not leak across projects.
2015-02-19 09:14:38 -05:00
Kitware Robot f7fc99cec6 CMake Nightly Date Stamp 2015-02-19 00:01:10 -05:00
Brad King 93a38a2abc Merge topic 'minor-cleanups'
6652afe6 CTest: Use clear instead of erase-all.
75661fdf cmListCommand: Move size variable out of loop.
10e53e23 cmAlgorithms: Add missing const to functors.
74906322 cmAlgorithms: Remove sort of already-sorted container.
2acd04c9 cmcmd: Remove some comment copy-pasta.
2d833232 cmCoreTryCompile: Remove variable assignment.
26602cf5 cmLocalGenerator: Move variable population inside of condition.
cfb84834 Update comment to match recent dashboard testing.
6010f936 Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
0550b9e3 Revert "Attempt to fix the compile of cmake on Sun CC."
1ee4721f Help: Fix formatting of command parameter.
62429a1e cmGlobalGenerator: Remove unneeded pointer check.
c697c1fa cmTarget: Remove template argument workaround.
2015-02-18 12:49:29 -05:00
Brad King d1cf09e3c2 CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg
When matching implicit library names, use a sentinel "x" to avoid
ever expanding the library name as a variable.  This was detected
by a CMP0054 warning.
2015-02-18 12:32:47 -05:00
Brad King a0f17fbe9c Windows-GNU: Do not tell find_library to treat '.dll' as linkable
Modern software distributions always use a separate ".dll.a" or ".lib"
import library for linking.
2015-02-18 09:40:25 -05:00
Brad King 05e4fc6b2a Merge branch 'binary-release-no-OpenSSL-on-Win-or-OSX' into release 2015-02-18 09:30:29 -05:00
Brad King 7e6608fe64 Utilities/Release: Build OS X and Win binaries without OpenSSL
This will tell our curl to use the OS-native TLS/SSL APIs.
2015-02-18 09:29:50 -05:00
Brad King 8371cd7893 Merge branch 'FindJNI-awt-arch' into release 2015-02-18 09:20:24 -05:00
Tiago Stürmer Daitx bce4e20f78 FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
JDK9's directory structure changes and no jdk/jre exists.  The arch
lib path is now jdk/lib/<arch> (instead of jdk/jre/lib/<arch>).
2015-02-18 09:19:17 -05:00
Kitware Robot 4fb9e847c0 CMake Nightly Date Stamp 2015-02-18 00:01:09 -05:00
Stephen Kelly 6652afe669 CTest: Use clear instead of erase-all. 2015-02-17 20:18:59 +01:00
Stephen Kelly 75661fdfd9 cmListCommand: Move size variable out of loop.
Re-use it where possible in two instances.
2015-02-17 20:18:58 +01:00
Stephen Kelly 10e53e2308 cmAlgorithms: Add missing const to functors. 2015-02-17 20:18:57 +01:00
Stephen Kelly 7490632258 cmAlgorithms: Remove sort of already-sorted container.
The indices is populated by an increasing number.
2015-02-17 20:18:57 +01:00
Stephen Kelly 2acd04c966 cmcmd: Remove some comment copy-pasta. 2015-02-17 20:18:56 +01:00
Stephen Kelly 2d833232a3 cmCoreTryCompile: Remove variable assignment.
The variable is not a reference, and we return in the same scope
after assigning, so it has no effect.
2015-02-17 19:23:27 +01:00
Stephen Kelly 26602cf56c cmLocalGenerator: Move variable population inside of condition.
It is only used in the condition, so no need to look for uses
elsewhere when reading the code.
2015-02-17 19:21:36 +01:00
Stephen Kelly cfb8483412 Update comment to match recent dashboard testing. 2015-02-17 19:20:23 +01:00
Stephen Kelly 6010f93632 Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"
This reverts commit ae6fc555a7.

Use the more-natural make_pair algorithm.  The compiler motivating
the need for this is not supported as a host anymore.
2015-02-17 19:19:06 +01:00
Stephen Kelly 0550b9e330 Revert "Attempt to fix the compile of cmake on Sun CC."
This reverts commit a573a85658.

The workaround is not needed on supported SolarisStudio compilers.
2015-02-17 19:18:12 +01:00
Stephen Kelly 1ee4721f7c Help: Fix formatting of command parameter. 2015-02-17 19:18:11 +01:00
Stephen Kelly 62429a1e54 cmGlobalGenerator: Remove unneeded pointer check.
Deleting nullptr is ok.
2015-02-17 19:18:11 +01:00
Stephen Kelly c697c1fafe cmTarget: Remove template argument workaround.
Pre-C++98 compilers required that the template argument be
used in the function parameters.  Those compilers are no longer
supported as hosts, so drop the workaround.
2015-02-17 19:18:11 +01:00
Brad King 5c635fa624 Merge topic 'vs7-OutputDirectory'
fa8b30eb VS: Fix .vcproj and .vfproj file OutputDirectory generation
aa2ba121 VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9
2015-02-17 10:09:13 -05:00
Kitware Robot 034f8e0bd9 CMake Nightly Date Stamp 2015-02-17 00:01:08 -05:00
Brad King fa8b30ebb5 VS: Fix .vcproj and .vfproj file OutputDirectory generation
Teach cmLocalVisualStudio7Generator to set 'OutputDirectory' using the
same method as is used to set the 'OutputFile' in the generated project
file.  Also, OutputDirectory only needs to be set for targets that run the
linker or librarian.  These two changes make the VS 7 OutputDirectory
consistent with what cmVisualStudio10TargetGenerator generates for OutDir.

Without this, since the VS Intel Fortran plugin for VS >= 10 still uses
the VS 7 .vfproj file format, when executing test VSGNUFortran using
Intel Fortran Compiler 15.xx, the following warning is issued just
before compilation:

  TargetPath(...) does not match the Linker's OutputFile property value (...).
  This may cause your project to build incorrectly.
  To correct this, please make sure that $(OutDir), $(TargetName) and $(TargetExt)
  property values match the value specified in %(Link.OutputFile).

Subsequently, an error is reported during linking.

Inspired-by: Vincent Newsum <vynewsum@gmail.com>
2015-02-16 11:48:16 -05:00
Brad King aa2ba12164 VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9
This will allow us to use a value other than just the config name
for the project OutputDirectory setting used for $(OutDir).

Also use $(ConfigurationName) instead of $(OutDir) for the link
directory configuration suffix since that is a hard-coded instance of
a use case for CMAKE_CFG_INTDIR.
2015-02-16 11:48:04 -05:00