summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | 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.
| | * | | | | | CPackRPM: Fix handling of relocation prefix parent directoriesDomen Vrankar2015-02-273-20/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 3ec02547 (CPackRPM: Allow multiple path relocation prefixes for one package, 2015-01-21) a regression was introduced that causes parent directories of relocation paths to be incorrectly included in the rpm. Fix this and make the test case more strict to cover it.
* | | | | | | | Merge topic 'update-kwsys'Brad King2015-02-273-30/+59
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26656865 Merge branch 'upstream-kwsys' into update-kwsys 5e2b418f KWSys 2015-02-25 (1b75ad3d)
| * | | | | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-02-263-30/+59
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | / | | | |_|_|_|/ | | |/| | | |
| | * | | | | KWSys 2015-02-25 (1b75ad3d)KWSys Robot2015-02-263-30/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 1b75ad3d | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' d4e7f08e..1b75ad3d Domen Vrankar (3): 2b042ff6 SystemTools: Optionally report error from GetRealPath 7c9a970a Glob: Remove dead code 1b75ad3d Glob: Remove addition of extra '/' Change-Id: I04ac5aa4748925bc953db0abff2d4418080882b5
* | | | | | | CMake Nightly Date StampKitware Robot2015-02-271-1/+1
|/ / / / / /
* | | | | | Merge topic 'windows-rc-enable-later'Brad King2015-02-264-9/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 772eae44 RC: Add platform-specific preprocessor definitions (#15404) 4300de3e RC: Enable language after C, CXX, or Fortran is enabled (#15404) 1de4a0fb RC: Drop unused CMAKE_COMPILE_RESOURCE variable setting
| * | | | | | RC: Add platform-specific preprocessor definitions (#15404)Brad King2015-02-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Platform/Windows-MSVC the C and CXX flags are initialized to contain preprocessor definitions describing the platform. On WinCE platforms this may not be just -DWIN32. This information may be important to RC sources too, so add such preprocessor definitions to the default RC flags. Suggested-by: Gunnar Roth <gunnar.roth@gmx.de>
| * | | | | | RC: Enable language after C, CXX, or Fortran is enabled (#15404)Brad King2015-02-253-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The RC language is special in that it is automatically enabled on Windows-based platforms when another primary language is enabled. Move enablement of RC from early in the enablement of the other language to late. This will allow it to use information detected as part of enabling C, CXX, or Fortran.
| * | | | | | RC: Drop unused CMAKE_COMPILE_RESOURCE variable settingBrad King2015-02-252-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable has long been replaced by CMAKE_RC_COMPILE_OBJECT. Stop setting it in platform modules.
* | | | | | | Merge topic 'ExternalData-url-algo-map'Brad King2015-02-2615-1/+96
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | f7f4ca55 ExternalData: Add support for custom algorithm-to-URL mapping
| * | | | | | ExternalData: Add support for custom algorithm-to-URL mappingBrad King2015-02-2515-1/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow URL templates to contain a %(algo:<key>) placeholder that is replaced by mapping the canonical hash algorithm name through a map defined by the <key>. Extend the Module.ExternalData test to cover the behavior. Extend the RunCMake.ExternalData test to cover error cases.
* | | | | | | CMake Nightly Date StampKitware Robot2015-02-261-1/+1
| | | | | | |
* | | | | | | Merge branch 'release'Brad King2015-02-250-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Merge branch 'sln-no-bom' into releaseBrad King2015-02-242-10/+0
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
* | | | | | | Merge topic 'test-drop-CTestTestFailedSubmit'Brad King2015-02-252-91/+0
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b10310e6 Tests: Drop CTestTestFailedSubmit-* tests
| * | | | | | | Tests: Drop CTestTestFailedSubmit-* testsBrad King2015-02-242-91/+0
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Everything they cover is now covered by RunCMake.ctest_submit test cases (except ctest_coverage LABELS which were not actually checked anyway). Drop these redundant tests.
* | | | | | | Merge topic 'CheckCompilerFlag-use-FLAGS'Brad King2015-02-253-12/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d5067ae Check*CompilerFlag: Refactor method used to pass flags
| * | | | | | | Check*CompilerFlag: Refactor method used to pass flagsMark Abraham2015-02-243-12/+12
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor the Check*CompilerFlag modules to pass the flags to Check*SourceCompiles using CMAKE_REQUIRED_FLAGS instead of CMAKE_REQUIRED_DEFINITIONS. Both end up being used, but the variable for "FLAGS" is more precise.
* | | | | | | Merge topic 'vs-midl-absolute-OutputDirectory'Brad King2015-02-251-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ee9005d cmVisualStudio10TargetGenerator: Wrap long line
generated by cgit v0.12 at 2024-11-11 15:37:30 (GMT)