summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'try_compile-COPY_FILE_ERROR'Brad King2013-07-1510-5/+78
|\ | | | | | | | | c28715b try_compile: Add COPY_FILE_ERROR option to capture failure
| * try_compile: Add COPY_FILE_ERROR option to capture failureBrad King2013-07-1510-5/+78
| | | | | | | | | | | | | | | | | | | | | | When the COPY_FILE operation fails optionally capture the error message with a COPY_FILE_ERROR option instead of reporting the error immediately. This gives callers a chance to do something else or report the error. Teach the RunCMake.try_compile test to cover bad argument combinations involving COPY_FILE_ERROR. Teach the TryCompile test to cover the case of a COPY_FILE error message captured by COPY_FILE_ERROR.
* | Merge topic 'cmake-error-advice'Brad King2013-07-158-3/+37
|\ \ | | | | | | | | | | | | 18e1bfb cmake: On configure error suggest looking at CMake*.log files
| * | cmake: On configure error suggest looking at CMake*.log filesBrad King2013-07-098-3/+37
| |/ | | | | | | | | | | | | | | | | | | When CMake reports failure to configure a project, especially when the toolchain does not initialize properly, the true reason may be clear from reading the CMakeFiles/CMake(Output|Error).log files. Advise users to look at these files if they exist when configuration fails. Add RunCMake.Configure test to check that the log files are mentioned when configuration fails.
* | Merge topic 'vs-flag-MAP-with-value'Brad King2013-07-153-3/+3
|\ \ | | | | | | | | | | | | f2caf79 VS: Fix /MAP:mapfile flag mapping (#14282)
| * | VS: Fix /MAP:mapfile flag mapping (#14282)Brad King2013-07-093-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have two mappings for the "/MAP" flag. The first does not care whether there is a value and activates the GenerateMapFile boolean setting. The second takes a value and puts it in the MapFileName setting. The latter must treat the ":" as part of the flag. This is similar to commit 8ae66bf4 (Fix optionally-valued booleans in VS 10 flag table, 2009-10-23).
* | | Merge topic 'doc-include-clarify'Brad King2013-07-151-4/+5
|\ \ \ | | | | | | | | | | | | | | | | e934b1f include: Clarify variable access scope for included file
| * | | include: Clarify variable access scope for included fileBrad King2013-07-091-4/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | The wording "Commands in the file are processed immediately as if they were written in place of the include command" sounds as if some kind of macro replacement is performed. This is not accurate. Update the wording to describe behavior of the included code in terms of the variable access scope.
* | | Merge topic 'try_compile-escape-flags'Brad King2013-07-153-8/+30
|\ \ \ | | | | | | | | | | | | | | | | 290857b try_compile: Escape CMAKE_<lang>_FLAGS in test projects (#14268)
| * | | try_compile: Escape CMAKE_<lang>_FLAGS in test projects (#14268)Brad King2013-07-153-8/+30
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | If CMAKE_<lang>_FLAGS contains quotes or other CMake language characters they must be escaped when written into the generated CMakeLists.txt file so that the test project parses them properly. Teach the TryCompile test to cover this case by adding a flag with quotes into CMAKE_C_FLAGS during a C language try_compile.
* | | Merge topic 'doc-ExternalProject-COMMAND-keyword'Brad King2013-07-151-0/+9
|\ \ \ | | | | | | | | | | | | | | | | 93c1165 ExternalProject: Document multiple COMMAND lines
| * | | ExternalProject: Document multiple COMMAND linesBrad King2013-07-081-0/+9
| | |/ | |/| | | | | | | | | | | | | | | | We support multiple commands per external project step by using the COMMAND keyword. Document this behavior and show an example. While at it, document that shell operators and current working directory behavior is not defined.
* | | Merge topic 'doc-project-top-level'Brad King2013-07-151-1/+7
|\ \ \ | | | | | | | | | | | | | | | | 4a71168 project: Document top-level CMakeLists.txt requirement
| * | | project: Document top-level CMakeLists.txt requirementBrad King2013-07-081-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake requires the top-level CMakeLists.txt to contain a direct call to the project() command and will insert one if there is not. Document this requirement since some authors have tried to use include() to load a file calling the project command.
* | | | Merge topic 'CPack-fixGeneratedChangelogFormat'Brad King2013-07-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 976e51d CPackRPM make the changelog line conform to expected format
| * | | | CPackRPM make the changelog line conform to expected formatEric NOULARD2013-07-081-1/+1
| | |/ / | |/| |
* | | | Merge topic 'IMPORTED-build-dependencies'Brad King2013-07-157-0/+67
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 4f7ceb5 Test non-IMPORTED libraries in the INTERFACE of IMPORTED libraries. 3405351 Add entire link interface transitive closure as target depends.
| * | | | Test non-IMPORTED libraries in the INTERFACE of IMPORTED libraries.Stephen Kelly2013-07-026-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a non-IMPORTED library is added to the INTERFACE_LINK_LIBRARIES of a IMPORTED target, the non-IMPORTED target needs to become a target dependency and link dependency of the consuming target. This is already the case since commit 30962029 (Make targets depend on the link interface of their dependees, 2012-12-26), and fixed in the parent commit, so test that it works.
| * | | | Add entire link interface transitive closure as target depends.Stephen Kelly2013-07-021-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was missing from commit 30962029 (Make targets depend on the link interface of their dependees., 2012-12-26), which caused only immeditate entries of the link interface to become target depends.
* | | | | Merge topic 'CPackRPM-protectATinFilename-reloaded'Brad King2013-07-151-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 1703e06 CPackRPM protect '@' character in filename processed in the spec file.
| * | | | | CPackRPM protect '@' character in filename processed in the spec file.Eric NOULARD2013-07-051-0/+10
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-07-151-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-07-141-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-07-131-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-07-121-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-07-111-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-07-101-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-07-091-1/+1
| |_|/ / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-081-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-071-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2013-07-061-1/+1
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2013-07-051-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2013-07-041-1/+1
| |_|/ |/| |
* | | Merge branch 'release'Brad King2013-07-031-0/+18
|\ \ \
| * | | CMake 2.8.11.2v2.8.11.2Brad King2013-07-022-1/+19
| | | |
| * | | Merge branch 'vs-generator-brief-doc-update' into releaseBrad King2013-07-023-3/+3
| |\ \ \
| * \ \ \ Merge branch 'vs12-generator' into releaseBrad King2013-07-0220-13/+978
| |\ \ \ \
| * \ \ \ \ Merge branch 'curl-bug-1192' into releaseBrad King2013-07-027-58/+9
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'sha2-alignment' into releaseBrad King2013-07-021-3/+3
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FixAsmSupport' into releaseBrad King2013-07-023-4/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'SelectLibraryConfigurations-cached-library' into releaseBrad King2013-07-021-1/+1
| |\ \ \ \ \ \ \ \
* | | | | | | | | | CMake Nightly Date StampKitware Robot2013-07-031-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge topic 'Fortran-explicit-types'Brad King2013-07-021-1/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b5bc2c Fortran: Use explicit type in Fortran 90 check
| * | | | | | | | | | Fortran: Use explicit type in Fortran 90 checkBrad King2013-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In CMakeTestFortranCompiler we build a test program using a Fortran 90 construct to check whether the compiler supports the language. Some compilers have options to require explicit variable types. Fix the test program to use an explicit variable type so it passes under such a configuration. Suggested-by: Neil Carlson <neil.n.carlson@gmail.com>
* | | | | | | | | | | Merge topic 'update-kwsys'Brad King2013-07-021-57/+57
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c314da0 Merge branch 'upstream-kwsys' into update-kwsys 2e3c935 KWSys 2013-07-01 (f6c4c247)
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2013-07-011-57/+57
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | KWSys 2013-07-01 (f6c4c247)KWSys Robot2013-07-011-57/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ f6c4c247 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 3d1d4e7c..f6c4c247 Sean McBride (1): f6c4c247 RegularExpression: Remove 'register' storage specifier Change-Id: I755712879ab86fa163f5fce684fff2f0ecd8ab99
* | | | | | | | | | | | Merge topic 'FindGTK2vd2'Brad King2013-07-021-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 60e4555 FindGTK2: Add GTK2_DEFINITIONS variable
| * | | | | | | | | | | | FindGTK2: Add GTK2_DEFINITIONS variableDaniele E. Domenichelli2013-06-291-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to https://wiki.gnome.org/gtkmm/MSWindows on MSVC the /vd2 flag should be passed to the compiler in order to use gtkmm
* | | | | | | | | | | | | Merge topic 'FindGTK2vs11'Brad King2013-07-021-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb16301 FindGTK2: Do not fail on MSVC11 if vc100 libraries are available