summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | |
| * | | | | | | Tests: Simplify CTest.UpdateGIT QUIET mode testBrad King2015-06-112-13/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Parameterize the dashboard script generation to configure custom content. Also move state cleanup from previous test back to its block.
* | | | | | | | Merge topic 'fix-fast-special-targets'Brad King2015-06-154-14/+25
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0efe4944 cmGlobalGenerator: Add ComputeHomeRelativeOutputPath method. bc1211fa cmLocalUnixMakefileGenerator3: Remove unused variable.
| * | | | | | | cmGlobalGenerator: Add ComputeHomeRelativeOutputPath method.Stephen Kelly2015-06-134-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix generation of tgt/fast build targets. Commit 363caa2f (cmLocalGenerator: De-virtualize Configure()., 2015-05-30) moved the computation of HomeRelativeOutputPath from Configure-time to Generate-time, because it is only used at Generate-time. However, that commit caused the member for one local generator to be computed immediately before generating with that local generator, whereas previously the members of all local generators were computed before generating any of them. The HomeRelativeOutputPath is used by the GetRelativeTargetDirectory method, which is called by the cmGlobalUnixMakefileGenerator3::WriteConvenienceRules method. That method is called by the cmLocalUnixMakefileGenerator3::WriteLocalMakefile method when generating for the top-most (ie, the first) local generator. At that point, the HomeRelativeOutputPath is not yet computed. Fix that by computing the member just before generating anything. This will eventually be done in the cmLocalUnixMakefileGenerator3 constructor instead, but further refactoring is needed to make that possible.
| * | | | | | | cmLocalUnixMakefileGenerator3: Remove unused variable.Stephen Kelly2015-06-131-1/+0
| | |_|_|_|/ / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-06-151-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-06-141-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-06-131-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-06-121-1/+1
|/ / / / /
* | | | | Merge topic 'FindBISON-DEFINES_FILE'Brad King2015-06-112-61/+100
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6863c0d5 Help: Add notes for topic 'FindBISON-DEFINES_FILE' 12e534c2 FindBISON: Add DEFINES_FILE option to pass --defines=FILE eb859263 FindBISON: Use CMAKE_PARSE_ARGUMENTS to parse arguments 29985ad8 FindBISON: Use BISON_TARGET macro argument names internally 801b799f FindBISON: Improve documentation formatting
| * | | | | Help: Add notes for topic 'FindBISON-DEFINES_FILE'Brad King2015-06-111-0/+6
| | | | | |
| * | | | | FindBISON: Add DEFINES_FILE option to pass --defines=FILEEon Jeong2015-06-091-8/+26
| | | | | |
| * | | | | FindBISON: Use CMAKE_PARSE_ARGUMENTS to parse argumentsEon Jeong2015-06-091-18/+23
| | | | | |
| * | | | | FindBISON: Use BISON_TARGET macro argument names internallyEon Jeong2015-06-091-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | The macro argument names are much clearer than ${ARGV#} references.
| * | | | | FindBISON: Improve documentation formattingBrad King2015-06-091-33/+43
| | | | | |
* | | | | | Merge topic 'fix-CMP0009-future-states'Brad King2015-06-111-8/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3a8177e cmFileCommand: Fix implementation of CMP0009.
| * | | | | | cmFileCommand: Fix implementation of CMP0009.Stephen Kelly2015-06-091-8/+4
| | | | | | |
* | | | | | | Merge topic 'minor-cleanups'Brad King2015-06-114-12/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22d09ecf cmLocalGenerator: Remove ConfigureFinalPass. 821a711b project(): Remove unused variable.
| * | | | | | | cmLocalGenerator: Remove ConfigureFinalPass.Stephen Kelly2015-06-093-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call the cmMakefile implementation directly. This is a configure-time construct.
| * | | | | | | project(): Remove unused variable.Stephen Kelly2015-06-091-1/+0
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2015-06-111-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge branch 'release'Brad King2015-06-100-0/+0
|\ \ \ \ \ \