summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CPackWIX: Refactor start menu and desktop shortcut creation.Nils Gladitz2015-02-217-150/+249
|
* CPackWIX: Explicitly list CPack WIX headers for IDE convenience.Nils Gladitz2015-02-201-0/+10
|
* Merge branch 'release'Brad King2015-02-200-0/+0
|\
| * Merge branch 'cmake-gui-reset-generator-toolset-and-platform' into releaseBrad King2015-02-191-0/+2
| |\
* | \ Merge topic 'find-command-prefix-from-PATH'Brad King2015-02-2023-5/+99
|\ \ \ | | | | | | | | | | | | | | | | ffc06c12 Teach find_(library|file|path) to get prefixes from PATH (#15370)
| * | | Teach find_(library|file|path) to get prefixes from PATH (#15370)Brad King2015-02-1923-5/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge topic 'cmake-gui-reset-generator-toolset-and-platform'Brad King2015-02-201-0/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | 1ade687d cmake-gui: Reset generator platform and toolset on configure (#15411)
| * | | cmake-gui: Reset generator platform and toolset on configure (#15411)Brad King2015-02-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | CMake Nightly Date StampKitware Robot2015-02-201-1/+1
| | | |
* | | | Merge branch 'release'Brad King2015-02-190-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'binary-release-no-OpenSSL-on-Win-or-OSX' into releaseBrad King2015-02-182-12/+2
| |\ \ \
| * \ \ \ Merge branch 'FindJNI-awt-arch' into releaseBrad King2015-02-181-0/+1
| |\ \ \ \
* | \ \ \ \ Merge topic 'CMakeParseImplicitLinkInfo-CMP0054'Brad King2015-02-191-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1cf09e3 CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted arg
| * | | | | | CMakeParseImplicitLinkInfo: Avoid if() auto-deref in quoted argBrad King2015-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'mingw-no-find_library-dll'Brad King2015-02-192-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0f17fbe Windows-GNU: Do not tell find_library to treat '.dll' as linkable
| * | | | | | | Windows-GNU: Do not tell find_library to treat '.dll' as linkableBrad King2015-02-182-1/+9
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Modern software distributions always use a separate ".dll.a" or ".lib" import library for linking.
* | | | | | | Merge topic 'compiler-version-Fortran'Brad King2015-02-195-11/+153
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | | | | | Help: Add notes for topic 'compiler-version-Fortran'Brad King2015-02-191-0/+6
| | | | | | | |
| * | | | | | | Fortran: Test that CMAKE_Fortran_COMPILER_VERSION is set (#15372)Brad King2015-02-191-9/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the CMakeOnly.CompilerIdFortran test to require that the variable is set instead of just warning. We already require it for C and CXX.
| * | | | | | | Fortran: Detect G95 compiler versionBrad King2015-02-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The __G95__ and __G95_MINOR__ preprocessor symbols encode the compiler version as decimal digits.
| * | | | | | | Fortran: Detect PGI compiler versionBrad King2015-02-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port logic from the "Compiler/PGI-DetermineCompiler" module into "CMakeFortranCompilerId.F.in".
| * | | | | | | Fortran: Detect XL and VisualAge compiler versionsBrad King2015-02-191-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port logic from the "Compiler/XL-*-DetermineCompiler" and "Compiler/VisualAge-*-DetermineCompiler" modules into "CMakeFortranCompilerId.F.in".
| * | | | | | | Fortran: Detect GNU compiler versionBrad King2015-02-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port logic from the "Compiler/GNU-DetermineCompiler" module into "CMakeFortranCompilerId.F.in".
| * | | | | | | Fortran: Detect PathScale compiler versionBrad King2015-02-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port logic from the "Compiler/PathScale-DetermineCompiler" module into "CMakeFortranCompilerId.F.in".
| * | | | | | | Fortran: Detect SunPro compiler versionBrad King2015-02-191-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port logic from "Compiler/SunPro-*DetermineCompiler" modules into "CMakeFortranCompilerId.F.in".
| * | | | | | | Fortran: Detect Intel compiler versionBrad King2015-02-191-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port logic from the "Compiler/Intel-DetermineCompiler" module into "CMakeFortranCompilerId.F.in".
| * | | | | | | Fortran: Add infrastructure to detect compiler version (#15372)Brad King2015-02-193-1/+103
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | Merge topic 'binary-release-no-OpenSSL-on-Win-or-OSX'Brad King2015-02-192-12/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 7e6608fe Utilities/Release: Build OS X and Win binaries without OpenSSL
| * | | | | | Utilities/Release: Build OS X and Win binaries without OpenSSLBrad King2015-02-182-12/+2
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | This will tell our curl to use the OS-native TLS/SSL APIs.
* | | | | | Merge topic 'FindJNI-awt-arch'Brad King2015-02-191-0/+1
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | bce4e20f FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)
| * | | | | FindJNI: Add arch-specific library dir for JDK 9 layout (#15408)Tiago Stürmer Daitx2015-02-181-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | 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>).
* | | | | CMake Nightly Date StampKitware Robot2015-02-191-1/+1
| | | | |
* | | | | Merge topic 'minor-cleanups'Brad King2015-02-1812-71/+24
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | CTest: Use clear instead of erase-all.Stephen Kelly2015-02-171-2/+1
| | | | |
| * | | | cmListCommand: Move size variable out of loop.Stephen Kelly2015-02-171-6/+6
| | | | | | | | | | | | | | | | | | | | Re-use it where possible in two instances.
| * | | | cmAlgorithms: Add missing const to functors.Stephen Kelly2015-02-171-3/+3
| | | | |
| * | | | cmAlgorithms: Remove sort of already-sorted container.Stephen Kelly2015-02-171-1/+0
| | | | | | | | | | | | | | | | | | | | The indices is populated by an increasing number.
| * | | | cmcmd: Remove some comment copy-pasta.Stephen Kelly2015-02-171-4/+0
| | | | |
| * | | | cmCoreTryCompile: Remove variable assignment.Stephen Kelly2015-02-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The variable is not a reference, and we return in the same scope after assigning, so it has no effect.
| * | | | cmLocalGenerator: Move variable population inside of condition.Stephen Kelly2015-02-171-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | It is only used in the condition, so no need to look for uses elsewhere when reading the code.
| * | | | Update comment to match recent dashboard testing.Stephen Kelly2015-02-171-1/+1
| | | | |
| * | | | Revert "cmGlobalGenerator: Fix value type pushed into autogens vector"Stephen Kelly2015-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit ae6fc555a7e8929f6d96545bd1137c8bd378566d. Use the more-natural make_pair algorithm. The compiler motivating the need for this is not supported as a host anymore.
| * | | | Revert "Attempt to fix the compile of cmake on Sun CC."Stephen Kelly2015-02-171-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit a573a856581118d7a9d8dd7be1f613ba7b1ddb04. The workaround is not needed on supported SolarisStudio compilers.
| * | | | Help: Fix formatting of command parameter.Stephen Kelly2015-02-171-1/+1
| | | | |
| * | | | cmGlobalGenerator: Remove unneeded pointer check.Stephen Kelly2015-02-171-5/+1
| | | | | | | | | | | | | | | | | | | | Deleting nullptr is ok.
| * | | | cmTarget: Remove template argument workaround.Stephen Kelly2015-02-172-37/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | CMake Nightly Date StampKitware Robot2015-02-181-1/+1
|/ / / /
* | | | Merge topic 'vs7-OutputDirectory'Brad King2015-02-174-9/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | fa8b30eb VS: Fix .vcproj and .vfproj file OutputDirectory generation aa2ba121 VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9
| * | | | VS: Fix .vcproj and .vfproj file OutputDirectory generationBrad King2015-02-161-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | | VS: Use $(ConfigurationName) as CMAKE_CFG_INTDIR in VS 7, 8, 9Brad King2015-02-164-7/+19
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.