summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmFunctionCommand: Store the FilePath when creating the prototype.Stephen Kelly2015-06-211-0/+3
|
* cmMacroCommand: Store the FilePath when creating the prototype.Stephen Kelly2015-06-211-4/+1
| | | | Instead of setting it each time the macro is invoked.
* CMake Nightly Date StampKitware Robot2015-06-211-1/+1
|
* CMake Nightly Date StampKitware Robot2015-06-201-1/+1
|
* Merge branch 'release'Brad King2015-06-190-0/+0
|\
| * Merge branch 'doc-CMAKE_GENERATOR_PLATFORM-typo' into releaseBrad King2015-06-181-1/+1
| |\
* | \ Merge topic 'GNUInstallDirs-special-prefixes'Brad King2015-06-1914-3/+237
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8bcec4d2 Help: Add notes for topic 'GNUInstallDirs-special-prefixes' c8bd37ec GNUInstallDirs: Add special cases for certain prefixes 5f30f175 GNUInstallDirs: Add test cases
| * | | Help: Add notes for topic 'GNUInstallDirs-special-prefixes'Brad King2015-06-181-0/+9
| | | |
| * | | GNUInstallDirs: Add special cases for certain prefixesAlex Turbov2015-06-184-33/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the module to handle SYSCONFDIR and LOCALSTATEDIR properly if CMAKE_INSTALL_PREFIX is set to `/` or `/usr` -- i.e. as expected by GNU Coding Standard (i.e. set SYSCONFDIR to `/etc` and `LOCALSTATEDIR` to `/var`). Also if CMAKE_INSTALL_PREFIX is set to /opt/pkg, `SYSCONFDIR` must be set to `/etc/opt/pkg` and `LOCALSTATEDIR` to `/var/opt/pkg` according to FHS.
| * | | GNUInstallDirs: Add test casesBrad King2015-06-1812-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a RunCMake.GNUInstallDirs test with cases covering various install prefixes. Hard-code the architecture information. Tolerate all platform-specific LIBDIR values. Currently the root prefix is not handled well, but verify the current behavior in the test anyway. This can be addressed with a future change. Inspired-by: Alex Turbov <i.zaufi@gmail.com>
* | | | Merge topic 'ConcurrentFortran-compiler-id'Brad King2015-06-198-6/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 54676a0e Help: Add notes for topic 'ConcurrentFortran-compiler-id' 7cd539b1 Add support for Concurrent Fortran 77 Compiler 0d204c1c CMakeDetermineCompilerId: Try matching compiler output to detect id 5f0dad75 CMakeDetermineCompilerId: Refactor id build/check loop logic c65a060e CMakeDetermineCompilerId: Optionally try some flags before no flags
| * | | | Help: Add notes for topic 'ConcurrentFortran-compiler-id'Brad King2015-06-181-0/+5
| | | | |
| * | | | Add support for Concurrent Fortran 77 CompilerBrad King2015-06-184-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Concurrent Fortran compiler (ccur.com) is available on Linux and can be used much like the GNU Fortran compiler. Currently it has no preprocessor symbols to identify it so we need to detect it by matching compiler output. Suggested-by: Anthony Ette <Anthony.R.Ette@controlsdata.com>
| * | | | CMakeDetermineCompilerId: Try matching compiler output to detect idBrad King2015-06-181-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers can only be distinguished by their compilation output rather than preprocessor symbols or special flags. Add infrastructure to determine the compiler id by matching output.
| * | | | CMakeDetermineCompilerId: Refactor id build/check loop logicBrad King2015-06-181-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Callers of CMAKE_DETERMINE_COMPILER_ID initialize the CMAKE_${lang}_COMPILER_ID to unset so we can check it at the end of each loop iteration instead of the beginning. This approach allows us to break out of the loop as soon as we succeed. It will also allow checks to be added in more places within the loop later.
| * | | | CMakeDetermineCompilerId: Optionally try some flags before no flagsBrad King2015-06-184-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMAKE_DETERMINE_COMPILER_ID to optionally try detecting the compiler id using some given flags before trying to detect it with no special flags. This will be useful for Fortran detection to distinguish some compilers that use the preprocessors of others but have no macro of their own by getting verbose output.
* | | | | Merge topic 'doc-CMAKE_GENERATOR_PLATFORM-typo'Brad King2015-06-191-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | 1c9db7db Help: Fix typo in CMAKE_GENERATOR_PLATFORM docs (#15621)
| * | | | Help: Fix typo in CMAKE_GENERATOR_PLATFORM docs (#15621)Brad King2015-06-181-1/+1
| | | | | | | | | | | | | | | | | | | | s/toolset/platform/
* | | | | Merge topic 'Embarcadero-ninja-link-pool'Brad King2015-06-191-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 078b60f0 Embarcadero: Run at most one linker invocation at a time (#15620)
| * | | | | Embarcadero: Run at most one linker invocation at a time (#15620)James Johnston2015-06-181-0/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least some versions (e.g. C++ Builder 5) of the bcc32 linker are known to write temporary files with a constant name to the current directory (e.g. "turboc.$ln"). (This can be verified by using Process Monitor to watch the file writes that bcc32 / ilink32 / implib make). This causes problems with some generators that keep a constant current directory and run concurrent linkers. For example, the Ninja generator, by default, always has the current directory set to the top of the build tree - resulting in conflicts between the linkers that are simultaneously trying to write to "turboc.$ln". Symptoms include direct errors regarding the "turboc.$ln" file, or later build steps failing due to corrupted output from previous links that happened to link "successfully." This is not a problem for the Borland Makefiles generator which does not run jobs in parallel. For the Ninja generator, work around this problem by using a link job pool of size 1.
* | | | | CMake Nightly Date StampKitware Robot2015-06-191-1/+1
|/ / / /
* | | | Merge topic 'linux-GNU-Fortran-no-rdynamic'Brad King2015-06-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f43defae GNU: Drop -rdynamic flag from Fortran
| * | | | GNU: Drop -rdynamic flag from FortranBrad King2015-06-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | The GNU Fortran compiler does not document support for this flag as the GNU C and C++ compilers do.
* | | | | Merge topic 'update-kwsys'Brad King2015-06-181-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 502430e3 Merge branch 'upstream-kwsys' into update-kwsys da4cddd7 KWSys 2015-06-15 (d217407c)
| * \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-06-161-1/+1
| |\ \ \ \ \
| | * | | | | KWSys 2015-06-15 (d217407c)KWSys Robot2015-06-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d217407c | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 8533a79b..d217407c Brad King (1): d217407c SystemTools: Fix preprocessor check WIN32 => _WIN32
* | | | | | | Merge topic 'quote-doxygen-tools'Brad King2015-06-181-13/+13
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15c6a4c9 Utilities/Doxygen: Support tools installed in paths with spaces
| * | | | | | | Utilities/Doxygen: Support tools installed in paths with spacesMichael Stürmer2015-06-161-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Quote paths to tools in generation script.
* | | | | | | | Merge topic 'GNUInstallDirs-doc-format'Brad King2015-06-181-27/+32
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 1199ebf1 GNUInstallDirs: Improve documentation formatting
| * | | | | | | GNUInstallDirs: Improve documentation formattingBrad King2015-06-161-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also consolidate the description of each variable.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-06-181-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2015-06-171-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge topic 'update-prebuilt-openssl'Brad King2015-06-162-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d1cef1a Utilities/Release: Update to openssl-1.0.2c
| * | | | | | | Utilities/Release: Update to openssl-1.0.2cBrad King2015-06-152-6/+6
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
* | | | | | | Merge topic 'fix-windows-preprocessor-checks'Brad King2015-06-163-7/+7
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 83af11d4 Fix preprocessor checks WIN32 => _WIN32
| * | | | | | | Fix preprocessor checks WIN32 => _WIN32Brad King2015-06-153-7/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is predefined by Windows toolchains and is more reliable. Reported-by: Michael Stürmer <michael.stuermer@schaeffler.com>
* | | | | | | Merge topic 'cmake--build-dir'Brad King2015-06-168-1/+29
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90ad087a cmake: Fix --build <relative-dir> for VS generators (#15609) 7195ec92 Tests: Extend RunCMake.CommandLine to cover --build with no arg
| * | | | | | | cmake: Fix --build <relative-dir> for VS generators (#15609)Brad King2015-06-116-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The VS >= 10 generators need to parse the .sln file from the build directory to locate targets in subdirectories. This occurs after we change the working directory to the build tree. If a relative directory other than "." was given then we would change to it and also refer to the .sln file location with it. Fix this by converting the build tree to a full path always. This will also give a more informative error message when the directory does not exist.
| * | | | | | | Tests: Extend RunCMake.CommandLine to cover --build with no argBrad King2015-06-113-0/+4
| | | | | | | |
* | | | | | | | Merge topic 'cpack-rpm-and-deb-runcmake-tests'Brad King2015-06-1621-28/+392
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f61ed99 Tests: Move RunCMake.CPackRPM case into RunCMake.CPack_RPM test e726fc02 Tests: Add RunCMake tests for CPack{Deb,RPM}
| * | | | | | | Tests: Move RunCMake.CPackRPM case into RunCMake.CPack_RPM testDomen Vrankar2015-06-157-28/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move PARTIALLY_RELOCATABLE_WARNING test to the new common CPack test script structure to have all tests in one place as well as additional benefit of having some more checks done during test execution.
| * | | | | | | Tests: Add RunCMake tests for CPack{Deb,RPM}Domen Vrankar2015-06-1516-0/+386
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add script structure for easier addition of new CPack related tests.
* | | | | | | | CMake Nightly Date StampKitware Robot2015-06-161-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'FindCUDA-fix-ccache'Brad King2015-06-151-9/+23
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b405f01d FindCUDA: Resolve a host compiler symlink only if it is Apple cc -> clang
| * | | | | | | FindCUDA: Resolve a host compiler symlink only if it is Apple cc -> clangBill Hoffman2015-06-151-9/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise using a "cc -> ccache" or similar symlink as the compiler causes FindCUDA to select ccache as the host compiler. Update the logic added by commit v3.1.0-rc1~354^2 (FindCUDA: Fix OSX Clang & no C language enabled, 2014-06-12) to apply only in the specific case it is needed.
* | | | | | | | Merge topic 'compiler-launcher'Brad King2015-06-1521-0/+119
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 698f7597 Add options to launch the compiler through tools like ccache or distcc
| * | | | | | | | Add options to launch the compiler through tools like ccache or distccBill Hoffman2015-06-1521-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a <LANG>_COMPILER_LAUNCHER target property (initialized by a CMAKE_<LANG>_COMPILER_LAUNCHER variable) to specify a compiler launcher tool. This will supersede the CMAKE_<LANG>_COMPILER_ARG1 approach to using such tools. The old approach set CMAKE_<LANG>_COMPILER to the launcher tool while the new approach leaves this variable set to the actual compiler. Implement this property for Makefile and Ninja generators. It cannot be implemented for VS or Xcode generators as the IDE build tools offer no such hooks.
* | | | | | | | | Merge topic 'ctest_update-RETURN_VALUE'Brad King2015-06-156-16/+112
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 493388ce ctest_update: Fix RETURN_VALUE on VCS tool failure (#15610) bcf25803 Tests: Teach CTest.Update* tests to check ctest_update return code b6667729 Tests: Simplify CTest.UpdateGIT QUIET mode test
| * | | | | | | | | ctest_update: Fix RETURN_VALUE on VCS tool failure (#15610)Brad King2015-06-116-2/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make RETURN_VALUE report -1 if the update command failed as the documentation claims. Also avoid reporting a ctest script-level failure if the update command fails because we still correctly administered the update step.
| * | | | | | | | | Tests: Teach CTest.Update* tests to check ctest_update return codeBrad King2015-06-111-2/+10
| | | | | | | | | |