summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release'Brad King2014-12-080-0/+0
|\
| * Merge branch 'xerces-rename' into releaseBrad King2014-12-055-35/+37
| |\
* | \ Merge topic 'custom-command-multiple-outputs'Brad King2014-12-0810-163/+140
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c67b816 Makefile: Workaround Borland Make bug with multiple outputs 65ea5eb7 Tests: Cover rebuild with multiple custom command outputs (#15116) 644b4688 Makefile: Fix rebuild with multiple custom command outputs (#15116) 8a4c6d2d Xcode: Fix rebuild with multiple custom command outputs (#15116)
| * | | Makefile: Workaround Borland Make bug with multiple outputsBrad King2014-12-063-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Given a rule of the form out1 out2: dep1 out1 out2: dep2 Borland Make complains that there are multiple rules for "out1" even though this works when there is only one output. Instead generate out1 out2: dep1 dep2 for Borland Make, but only when there are multiple outputs.
| * | | Tests: Cover rebuild with multiple custom command outputs (#15116)Brad King2014-12-052-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the BuildDepends test with a case covering multiple custom command outputs with the second one consumed by another rule. With the old "multiple output pair" infrastructure used in the Makefile and Xcode generators this did not work. Now that it is fixed, test the case explicitly.
| * | | Makefile: Fix rebuild with multiple custom command outputs (#15116)Brad King2014-12-055-111/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the generated makefiles for custom commands with multiple outputs to list all the outputs on the left hand side of the build rule. This is much simpler and more reliable than the old multiple-output-pair infrastructure.
| * | | Xcode: Fix rebuild with multiple custom command outputs (#15116)Brad King2014-12-052-52/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode generator uses Makefiles under a run-script build-phase to drive custom commands. Fix the generated makefiles for custom commands with multiple outputs to list all the outputs on the left hand side of the build rule. This is much simpler and more reliable than the old multiple-output-pair infrastructure.
* | | | Merge topic 'optional-latest-language-dialects'Brad King2014-12-081-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | de022e89 Add options to build CMake without latest language dialects
| * | | | Add options to build CMake without latest language dialectsBrad King2014-12-051-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set CMAKE_C_STANDARD and CMAKE_CXX_STANDARD only if they are not already defined. This will allow users to add the settings with different values to their local cache (e.g. on the command line).
* | | | | Merge topic 'file-LOCK-timeout-type'Brad King2014-12-089-23/+27
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 97841dad file: Use 'long' to represent the parsed LOCK TIMEOUT value
| * | | | | file: Use 'long' to represent the parsed LOCK TIMEOUT valueRuslan Baratov2014-12-059-23/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert the StringToInt helper into a StringToLong helper with a 'long' result type. This will make the helper more useful to other callers that want to use strtol. While at it, also check errno after calling strtol in case the conversion fails with a range error.
* | | | | | Merge topic 'ctest-binary-pipe'Brad King2014-12-081-0/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 29b0c8c3 ctest --launch: write to cout and cerr in binary
| * | | | | | ctest --launch: write to cout and cerr in binaryBen Boeckel2014-12-051-0/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because ctest reads in binary but writes in text mode, Windows' newline transformation can be applied multiple times causing '\n' in the source application to be written out as '\r\r\n' instead.
* | | | | | Merge topic 'ExternalProject_TEST_EXCLUDE_FROM_MAIN'Brad King2014-12-083-4/+52
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 636f0c1d ExternalProject: Add TEST_EXCLUDE_FROM_MAIN option
| * | | | | | ExternalProject: Add TEST_EXCLUDE_FROM_MAIN optionDaniele E. Domenichelli2014-12-053-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this option is enabled, the test step is created with the EXCLUDE_FROM_MAIN option, and if TEST_BEFORE_INSTALL is enabled, the install step does not depend on the test step. This means that the test step is never executed, unless the test target is explicitly created by calling ExternalProject_Add_StepTarget, or by passing it with the STEP_TARGETS option, or with the EP_STEP_TARGETS directory property.
* | | | | | | Merge topic 'vs-inherit-wd'Brad King2014-12-081-0/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f545eb0b VS: Inherit target-level "-wd" flags in source files (#15284)
| * | | | | | | VS: Inherit target-level "-wd" flags in source files (#15284)Brad King2014-12-041-0/+5
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a source file COMPILE_FLAGS option adds "-wd", the .vcxproj file will have a DisableSpecificWarnings setting for the source file. Add to the setting a reference to %(DisableSpecificWarnings) to inherit any such flags set for the whole target.
* | | | | | | Merge topic 'FindMPI-Intel-5.0.1'Brad King2014-12-081-21/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7626c8dc FindMPI: Workaround Intel MPI 5.0.1 exit code problem (#15182) f5ede300 FindMPI: Factor out compiler wrapper execution into helper
| * | | | | | | FindMPI: Workaround Intel MPI 5.0.1 exit code problem (#15182)Alin Marin Elena2014-12-041-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This MPI compiler may return zero even in some error cases. Check the output to catch such cases. Suggested-by: Kelly Thompson <kgt@lanl.gov>
| * | | | | | | FindMPI: Factor out compiler wrapper execution into helperAlin Marin Elena2014-12-041-21/+13
| |/ / / / / /
* | | | | | | Merge topic 'try_compile-link-flags'Brad King2014-12-0812-1/+170
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 88eb5824 try_compile: Pass linker flags into test project (#14066) a4f9b6f0 CMakeDetermineCompilerABI: Use normal linker flags in ABI project
| * | | | | | | try_compile: Pass linker flags into test project (#14066)Brad King2014-12-0311-0/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy CMAKE_EXE_LINKER_FLAGS into the test project generated by try_compile, just like we already copy CMAKE_<LANG>_FLAGS. Add CMake Policy CMP0056 to activate this behavior in a compatible way, but do not warn by default when the policy is not set since it will affect all try_compile calls. Extend the RunCMake.try_compile test with a case covering this behavior for each policy setting.
| * | | | | | | CMakeDetermineCompilerABI: Use normal linker flags in ABI projectBrad King2014-12-032-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When compiling the ABI detection test project, do not override CMAKE_EXE_LINKER_FLAGS completely. The normally selected value of this variable may influence how the link is done and may be needed to be representative of how the calling project will be built. Instead pass a variable that try_compile will reference as additional flags. Leave this behavior of try_compile undocumented for now.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-12-081-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-12-071-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-12-061-1/+1
| |_|_|_|/ / / |/| | | | | |
* | | | | | | Merge branch 'release'Brad King2014-12-050-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'doc-file-GENERATE-order' into releaseBrad King2014-12-051-1/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'doc-mixed-case-commands' into releaseBrad King2014-12-041-2/+10
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'xerces-rename'Brad King2014-12-055-35/+37
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | 27141eed Modules: Rename FindXerces to FindXercesC
| * | | | | | | | Modules: Rename FindXerces to FindXercesCBrad King2014-12-045-35/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindXerces module was added in commit v3.1.0-rc1~155^2 (FindXerces: New module to find Apache Xerces-C++, 2014-08-17). However, there are two implementations of Xerces, one in C++: http://xerces.apache.org/xerces-c/ and one in Java: http://xerces.apache.org/xerces-j/ Rename FindXerces to FindXercesC to clarify that it is about the C++ implementation. While at it, add the missing CMake 3.1 release note about this module. Suggested-by: Erik Sjölund <erik.sjolund@gmail.com>
* | | | | | | | | Merge topic 'doc-file-GENERATE-order'Brad King2014-12-051-1/+3
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | / | |_|_|_|_|_|_|/ |/| | | | | | | fe21580b Help: Document file(GENERATE) signature option order
| * | | | | | | Help: Document file(GENERATE) signature option orderBrad King2014-12-051-1/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~484^2 (Help: Format and revise file() command documentation, 2014-05-23) the signature of file(GENERATE) was accidentally simplified too much and dropped specification of the required argument ordering. Restore the signature to make the order clear.
* | | | | | | Merge topic 'Find-Modules-documentation'Brad King2014-12-052-19/+53
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67cb50ab Help: Document that IMPORTED targets in Find modules may be UNKNOWN. e18e21ae Help: Document IMPORTED_CONFIGURATIONS target property for Find modules. f0d0d761 Help: Remove recommendation about checking minimum CMake version. 31452416 Help: Add useful links to IMPORTED targets and usage requirements. b96b025b Help: Remove disadvantage creating IMPORTED targets in Find modules. 169f1166 Help: Link to cmake-packages(7) from the Module creation documentation.
| * | | | | | Help: Document that IMPORTED targets in Find modules may be UNKNOWN.Stephen Kelly2014-12-041-0/+5
| | | | | | |
| * | | | | | Help: Document IMPORTED_CONFIGURATIONS target property for Find modules.Stephen Kelly2014-12-041-1/+40
| | | | | | |
| * | | | | | Help: Remove recommendation about checking minimum CMake version.Stephen Kelly2014-12-041-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If this file is being executed, the user has the CMake version providing it.
| * | | | | | Help: Add useful links to IMPORTED targets and usage requirements.Stephen Kelly2014-12-041-4/+3
| | | | | | |
| * | | | | | Help: Remove disadvantage creating IMPORTED targets in Find modules.Stephen Kelly2014-12-041-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An IMPORTED target in either type of package can equally depend on an IMPORTED target in a Find module, which must be found as a dependency, which is presumably the problem being implied. This is not a distinction of creating an IMPORTED target in a Find module.
| * | | | | | Help: Link to cmake-packages(7) from the Module creation documentation.Stephen Kelly2014-12-042-1/+5
| | |_|_|_|/ | |/| | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-12-051-1/+1
|/ / / / /
* | | | | Merge topic 'FindUnixCommands-use-FPHSA'Brad King2014-12-041-3/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | ff50046b FindUnixCommand: Use FPHSA to report status in standard way
| * | | | | FindUnixCommand: Use FPHSA to report status in standard wayChristoph Grüninger2014-12-031-3/+9
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Otherwise the UnixCommands were marked as not found in the summary. Also revise the documentation.
* | | | | Merge topic 'cached-regex-clear-fixed'Brad King2014-12-0413-43/+199
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ceecd790 cmMakefile: store the number of last matches in a CMake var 7878d061 test: add a test for clearing regex results
| * | | | | cmMakefile: store the number of last matches in a CMake varBen Boeckel2014-12-038-43/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With PushScope and PopScope, keeping track of another bit of data for each scope isn't easy. Instead, store it as another CMake variable so it gets implicitly tracked along with everything else. This works in a revert of commit 7d674b5f0b28a610333644d417c2e8cb796cc9e4.
| * | | | | test: add a test for clearing regex resultsBen Boeckel2014-12-035-0/+116
| | | | | |
* | | | | | Merge topic 'fix-add_library-check-for-shared'Brad King2014-12-041-3/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd360ee3 add_library: Fix target type check for non-shared-lib platforms
| * | | | | | add_library: Fix target type check for non-shared-lib platformsBrad King2014-12-031-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When checking target types for TARGET_SUPPORTS_SHARED_LIBS == false, enumerate exactly the library types not supported rather than trying to maintain a list of all the types that are supported. Otherwise add_library(SomeImportedLib UNKNOWN IMPORTED) warns on platforms that do not support shared libraries. Reported-by: Kelly Thompson <kgt@lanl.gov>
* | | | | | | Merge topic 'vs-hlsl-typo'Brad King2014-12-041-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 955fbf29 VS: Fix typo in VS_SHADER_MODEL lookup comment
| * | | | | | | VS: Fix typo in VS_SHADER_MODEL lookup commentBrad King2014-12-031-1/+1
| | | | | | | |