summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Genex: Enable use of COMPILE_LANGUAGE for compile options.Stephen Kelly2015-03-0919-12/+185
| | | | | | Follow-ups will allow the use of the generator expression for compile definitions and include directories for non-IDE generators.
* Genex: Add a COMPILE_LANGUAGE generator expression.Stephen Kelly2015-03-0726-6/+162
|
* VS6: Compute CMAKE_*_FLAGS and COMPILE_DEFINITIONS* only when neededBrad King2015-03-071-70/+75
| | | | | These placeholders are used only in the .dsp templates for targets that actually compile sources.
* Merge topic 'InstallRequiredSystemLibraries-COMPONENT'Brad King2015-03-042-27/+52
|\ | | | | | | | | | | e97141c2 InstallRequiredSystemLibraries: Add option to specify install COMPONENT d6a320ab InstallRequiredSystemLibraries: Format documentation
| * InstallRequiredSystemLibraries: Add option to specify install COMPONENTJohan Andruejol2015-03-032-2/+18
| | | | | | | | | | | | | | | | Previously the module did not support projects using installation components because install(PROGRAMS) was never called with COMPONENT. Add an option to specify the COMPONENT so that projects doing this do not have to resort to using CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_SKIP and writing the install rule by hand.
| * InstallRequiredSystemLibraries: Format documentationBrad King2015-03-031-25/+34
| |
* | Merge topic 'fix-JOM-quiet-make'Brad King2015-03-041-1/+1
|\ \ | | | | | | | | | | | | 3e98ebba JOM: Pass /NOLOGO when driving builds as is done for NMake
| * | JOM: Pass /NOLOGO when driving builds as is done for NMakeBrad King2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | This fixes RunCMake.(Configure|configure_file|try_compile) test failures that failed to match empty stderr due to jom printing its identification line.
* | | Merge branch 'release'Brad King2015-03-040-0/+0
|\ \ \
| * | | CMake 3.2.0v3.2.0Brad King2015-03-031-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2015-03-041-1/+1
| |_|/ |/| |
* | | Merge branch 'release'Brad King2015-03-030-0/+0
|\ \ \ | |/ /
| * | Merge branch 'backport-KWSys-SystemTools-CopyFileAlways-fix' into releaseBrad King2015-03-021-0/+4
| |\ \
* | \ \ Merge topic 'backport-KWSys-SystemTools-CopyFileAlways-fix'Brad King2015-03-030-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | b8ea771b KWSys SystemTools: Update CopyFileAlways stream library workarounds
| * | | KWSys SystemTools: Update CopyFileAlways stream library workaroundsPaul Martin2015-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | On some stream libraries failbit is not set when trying to read past EOF. Instead, always exit the copy loop when gcount() is zero.
* | | | Merge topic 'cpack-strict-variable-selection'Brad King2015-03-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3b9f963f CPack: be more stringent when selecting variables to encode
| * | | | CPack: be more stringent when selecting variables to encodeРоман Донченко2015-03-021-1/+1
| | |_|/ | |/| | | | | | | | | | The old version would admit, for example, a variable named "xxxCPACK".
* | | | Merge topic 'update-kwsys'Brad King2015-03-031-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | e88f3b3b Merge branch 'upstream-kwsys' into update-kwsys 7c9afb57 KWSys 2015-02-27 (d2aa1afd)
| * \ \ \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-03-021-0/+4
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | KWSys 2015-02-27 (d2aa1afd)KWSys Robot2015-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d2aa1afd | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 1b75ad3d..d2aa1afd Paul Martin (1): d2aa1afd SystemTools: Update CopyFileAlways stream library workarounds Change-Id: I676f2f11ac0d52f7ffc3af5bb444d3726c121be0
* | | | | CMake Nightly Date StampKitware Robot2015-03-031-1/+1
|/ / / /
* | | | Merge branch 'release'Brad King2015-03-020-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'fix-crash-on-bad-LANG_STANDARD' into releaseBrad King2015-02-285-1/+17
| |\ \ \
* | \ \ \ Merge topic 'locale-agnostic-findhg'Brad King2015-03-021-0/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cfb22354 FindHg: Run hg with C locale when querying its version.
| * | | | | FindHg: Run hg with C locale when querying its version.Nils Gladitz2015-02-281-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LANGUAGE should be ignored when LC_ALL=C. It seems this isn't the case with hg so set both.
* | | | | | Merge topic 'modules-check-ARGC'Brad King2015-03-028-39/+121
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7631fc4 Modules: Check for ARGC before using ARGV#
| * | | | | | Modules: Check for ARGC before using ARGV#Daniele E. Domenichelli2015-02-278-39/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ARGV# could be defined from a parent scope.
* | | | | | | Merge topic 'fix-ctest-update-locale'Brad King2015-03-021-12/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6a661f06 CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES.
| * | | | | | | CTest: To enforce the C locale use LC_ALL instead of LC_MESSAGES.Nils Gladitz2015-02-271-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If LC_ALL is set it takes precedence over LC_MESSAGES.
* | | | | | | | Merge topic 'fix-crash-on-bad-LANG_STANDARD'Brad King2015-03-025-1/+17
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | 00d66557 Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)
| * | | | | | | Diagnose invalid <LANG>_STANDARD value instead of crashing (#15426)Brad King2015-02-285-1/+17
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-03-021-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2015-03-011-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-02-281-1/+1
| | | | | |
* | | | | | Merge branch 'release'Brad King2015-02-270-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'cpack_rpm_mulit_prefix_fixup' into releaseBrad King2015-02-273-20/+62
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'install-manifest-optimize' into releaseBrad King2015-02-262-12/+10
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'macro-function-docs'Brad King2015-02-272-36/+50
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4efef3f7 Help: Clarify that ARGV# beyond ARGC will have an undefined behavior (#15380) e3363bfb Help: Refine the .rst formatting of macro and function documentation
| * | | | | | | Help: Clarify that ARGV# beyond ARGC will have an undefined behavior (#15380)Daniele E. Domenichelli2015-02-262-2/+15
| | | | | | | |
| * | | | | | | Help: Refine the .rst formatting of macro and function documentationDaniele E. Domenichelli2015-02-262-34/+35
| | | | | | | |
* | | | | | | | Merge topic 'remove_error_read_script'Brad King2015-02-2721-25/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6bf13097 CTest: Drop "Error in read script" message at end of testing
| * | | | | | | | CTest: Drop "Error in read script" message at end of testingZack Galbreath2015-02-2721-25/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A more-specific error message is always displayed earlier in the output if any real error occurred. This final summary message is distracting to readers searching through the output for the word "error". Simply drop it.
* | | | | | | | | Merge topic 'cmake-build-ninja-verbose'Brad King2015-02-2720-22/+57
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1082448 Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v' ce935ebe cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for Ninja
| * | | | | | | | | Tests: Extend RunCMake.CommandLine to cover 'cmake --build' for 'ninja -v'Brad King2015-02-263-0/+22
| | | | | | | | | |
| * | | | | | | | | cmake: Teach --build to honor CMAKE_VERBOSE_MAKEFILE for NinjaGregor Jasny2015-02-2617-22/+35
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Ninja build system does not support a in-file verbositiy switch. Instead teach 'cmake --build' to extract the CMAKE_VERBOSE_MAKEFILE setting and pass it as an optional '-v' argument to Ninja. This can serve as a reasonable fallback. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | | | Merge topic 'install-manifest-optimize'Brad King2015-02-272-12/+10
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | c4814174 install: Write the entire installation manifest at once
| * | | | | | | | install: Write the entire installation manifest at onceRobert Goulet2015-02-262-12/+10
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid a separate open/close for each file installed. Use a single file(WRITE) instead of a loop with file(APPEND).
* | | | | | | | Merge topic 'cpack_rpm_mulit_prefix_fixup-for-master'Brad King2015-02-273-39/+62
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3db740cb CPackRPM: Consolidate CPackComponentsForAll test case coverage 3cf86d9e Merge branch 'cpack_rpm_mulit_prefix_fixup' into cpack_rpm_mulit_prefix_fixup-for-master 1cbb1562 CPackRPM: Fix handling of relocation prefix parent directories
| * | | | | | | | CPackRPM: Consolidate CPackComponentsForAll test case coverageDomen Vrankar2015-02-271-25/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use test infrastructure added by commit 1cbb1562 (Fix handling of relocation prefix parent directories, 2015-02-26) to cover the same use cases from tests added by commit 5857ca5e (CPackRPM: Drop explicit handling of '@' symbols that breaks them, 2015-01-07) and drop the latter.
| * | | | | | | | Merge branch 'cpack_rpm_mulit_prefix_fixup' into ↵Domen Vrankar2015-02-273-20/+63
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | cpack_rpm_mulit_prefix_fixup-for-master Resolve conflict in Tests/CPackComponentsForAll/RunCPackVerifyResult.cmake by combining the changes from both sides.