summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check*CompilerFlag: Revert to previous method used to pass flags (#15641)Brad King2015-07-084-12/+19
| | | | | | | | | Since commit v3.3.0-rc1~397^2 (Check*CompilerFlag: Refactor method used to pass flags, 2015-02-24) these check modules pass the flags to the compiler front-end during linking as well as during compilation. This breaks checks for flags like '-x c++' that are meant only for the compilation step. Revert the change and add a test covering a compiler-only flag.
* 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 'cleanup-cmAlgorithms'Brad King2015-02-241-24/+37
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | 47c2da6a cmAlgorithms: Cache the end iterators in algorithms. a5b10ae6 cmAlgorithms: Remove needless assignment. 7fd8557f cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices. 1f796791 cmAlgorithms: Relax iterator requirement for cmRemoveIndices. ba959934 cmAlgorithms: Make cmRemoveDuplicates work with more containers. cae45df7 cmAlgorithms: Rename template argument to RemoveN. b917f4c0 cmAlgorithms: Relax cmRemoveN requirement to FwdIter. bbc1a978 cmAlgorithms: Add a size() to cmRange. 47a3e22e cmAlgorithms: Rename template type in cmDeleteAll algorithm. cb75eec0 cmAlgorithms: Add const to const objects.
| * cmAlgorithms: Cache the end iterators in algorithms.Stephen Kelly2015-02-241-4/+7
| |
| * cmAlgorithms: Remove needless assignment.Stephen Kelly2015-02-241-2/+1
| |
| * cmAlgorithms: Maintain the pivot iterator in cmRemoveIndices.Stephen Kelly2015-02-241-2/+4
| | | | | | | | | | Avoid the algorithm of 'Schlemiel the painter' in the case of iterators which are not RandomAccess.
| * cmAlgorithms: Relax iterator requirement for cmRemoveIndices.Stephen Kelly2015-02-241-2/+5
| | | | | | | | Require only forward iterators from the range.
| * cmAlgorithms: Make cmRemoveDuplicates work with more containers.Stephen Kelly2015-02-241-2/+3
| | | | | | | | | | Remove the accidental requirement that the input range must be a std::vector.
| * cmAlgorithms: Rename template argument to RemoveN.Stephen Kelly2015-02-241-3/+3
| |
| * cmAlgorithms: Relax cmRemoveN requirement to FwdIter.Stephen Kelly2015-02-241-1/+3
| | | | | | | | cmRotate already requires only FwdIter.
| * cmAlgorithms: Add a size() to cmRange.Stephen Kelly2015-02-241-0/+3
| | | | | | | | | | size() is already used by cmRemoveDuplicates, which is designed to accept a cmRange.
| * cmAlgorithms: Rename template type in cmDeleteAll algorithm.Stephen Kelly2015-02-231-10/+10
| | | | | | | | It may be any range, not only a container.
| * cmAlgorithms: Add const to const objects.Stephen Kelly2015-02-231-3/+3
| |
* | Merge topic 'FindMatlab-remove-trailing-lines'Brad King2015-02-241-1/+0
|\ \ | | | | | | | | | | | | 08d1e65a FindMatlab: Remove trailing blank lines
| * | FindMatlab: Remove trailing blank linesBrad King2015-02-241-1/+0
| | |
* | | Merge topic 'osx-CFBundleExecutable'Brad King2015-02-241-1/+2
|\ \ \ | | | | | | | | | | | | | | | | 78ec4b16 OS X: Shorten CFBundleExecutable to file name only
| * | | OS X: Shorten CFBundleExecutable to file name onlyGregor Jasny2015-02-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Shorten the CFBundleExecutable in the PList file of Bundles to the file name only as it is done for Frameworks, too. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | Merge topic 'osx-framework-search-platform-SDKs'Brad King2015-02-244-1/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0ee2a004 OS X: Add platform-specific Frameworks search path
| * | | | OS X: Add platform-specific Frameworks search pathGregor Jasny2015-02-234-1/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise find_library is unable to lookup the XCTest framework which is not located in the SDK serach path: In the 10.10 SDK the SDK frameworks are located here: $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks whereas the Platform SDKs are located here: $DEVELOPER_DIR/Platforms/MacOSX.platform/Developer/Library/Frameworks Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | Merge topic 'FeatureSummary-no-duplicates'Brad King2015-02-244-0/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 38ef2b73 FeatureSummary: Print each feature info only once
| * | | | FeatureSummary: Print each feature info only onceGregor Jasny2015-02-234-0/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | If a feature is added multiple times via ADD_FEATURE_INFO it should appear only once in FEATURE_SUMMARY. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | Merge topic 'vs-midl-absolute-OutputDirectory'Brad King2015-02-241-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 0b54e836 VS: Specify absolute output directory for the Midl tool
| * | | | VS: Specify absolute output directory for the Midl toolTim Blechmann2015-02-231-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Generate the OutputDirectory element value as an absolute path to the same location as the existing relative path. Somehow this addresses an occasional failure in a large/complex build, and should not hurt basic use cases.
* | | | Merge topic 'rpm_at_in_path'Brad King2015-02-243-12/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5857ca5e CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)
| * | | | CPackRPM: Drop explicit handling of '@' symbols that breaks them (#14782)Domen Vrankar2015-02-243-12/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v2.8.12~218^2 (CPackRPM protect '@' character in filename processed in the spec file, 2013-07-05) was not necessary after commit v2.8.12~439^2 (Add support for componentized USER spec file, 2013-04-01). The latter replaced ${VAR} references in the spec file template string with \@VAR\@ references, thus protecting '@' symbols automatically. This caused CPackRPM to break paths with @ symbols. Revert the change to fix the behavior, and add a test case.
* | | | Merge topic 'GetPrerequisites-file-command-update'Brad King2015-02-241-0/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fe558718 GetPrerequisites: Update output matching for newer 'file' versions
| * | | | GetPrerequisites: Update output matching for newer 'file' versionsMarcus Meissner2015-02-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect PIE binaries with newer 'file' (5.22). It no longer prints "(uses shared libraries)" but does print "interpreter": # file 5.19 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked (uses shared libs), ... # file 5.22 $ file /usr/bin/su /usr/bin/su: ... shared object, ..., dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2, ...
* | | | | Merge topic 'ctest-output-options'Brad King2015-02-2483-586/+1049
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff1ddd2a ctest_upload: Add QUIET option 0b87b2a3 ctest_memcheck: Add QUIET option fc58bdb9 ctest_coverage: Add QUIET option 876a680d ctest_test: Add QUIET option 49ba4545 ctest_build: Add QUIET option f999dc0b ctest_configure: Add QUIET option 645ad117 ctest_update: Add QUIET option 19d1a559 ctest_start: Add QUIET option 1643b905 ctest_submit: Add QUIET option 12db1139 CTest: Add cmCTestOptionalLog macro
| * | | | | ctest_upload: Add QUIET optionZack Galbreath2015-02-239-3/+44
| | | | | |
| * | | | | ctest_memcheck: Add QUIET optionZack Galbreath2015-02-237-48/+65
| | | | | |
| * | | | | ctest_coverage: Add QUIET optionZack Galbreath2015-02-2316-216/+290
| | | | | |
| * | | | | ctest_test: Add QUIET optionZack Galbreath2015-02-2311-50/+105
| | | | | |
| * | | | | ctest_build: Add QUIET optionZack Galbreath2015-02-239-40/+99
| | | | | |
| * | | | | ctest_configure: Add QUIET optionZack Galbreath2015-02-239-9/+54
| | | | | |
| * | | | | ctest_update: Add QUIET optionZack Galbreath2015-02-235-40/+89
| | | | | |
| * | | | | ctest_start: Add QUIET optionZack Galbreath2015-02-2310-42/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This suppresses all non-error messages that would have otherwise been printed by this function.
| * | | | | ctest_submit: Add QUIET optionZack Galbreath2015-02-2311-126/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifying this option prevents CTest from printing any non-error messages to the console for this call to ctest_submit().
| * | | | | CTest: Add cmCTestOptionalLog macroZack Galbreath2015-02-232-12/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmCTestOptionalLog takes a boolean argument that indicates whether or not the message should be suppressed. Note that error messages will still be printed, even if suppression is requested. This macro will allow us to provide more fine-grained control over what messages CTest prints to the console.
* | | | | | Merge topic 'test-RunCMake-refactor-ctest'Brad King2015-02-24149-120/+104
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2b9e7f7 Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheck 7ce9f6e2 Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test output 69de0f7e Tests: Teach RunCMake to tolerate Guard Malloc lines in test output 57f2aa7c Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test output b04c8ec3 Tests: Match curl error in RunCMake.ctest_submit FailDrop-* cases 1d82105e Tests: Rename RunCMake.{CTestMemcheck => ctest_memcheck} d7662141 Tests: Rename RunCMake.{CTestSubmit => ctest_submit} 9b50388b Tests: Split RunCTest helper out of RunCMake.CTest(Submit|Memcheck) 76e7c22b Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmit
| * | | | | Tests: Drop unnecessary stderr matching from RunCMake.ctest_memcheckBrad King2015-02-235-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Dummy*-stderr.txt files were needed only to match platform-specific memcheck tooling output and verify that stderr is otherwise empty. Now that the RunCMake infrastructure knows how to strip such lines before matching, we can simply drop these files and use the default empty string match.
| * | | | | Tests: Teach RunCMake to tolerate 'Error kstat returned' lines in test outputBrad King2015-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When RunCMake tests run on Solaris, the output may contain unexpected lines of the form "Error kstat returned...". These lines are printed by SystemInformationImplementation::RunProcess when called from SystemInformationImplementation::ParseValueFromKStat (see issue #12066). Until someone investigates why kstat returns values outside the range it documents, simply remove such lines from the actual output before matching it against the expected output.
| * | | | | Tests: Teach RunCMake to tolerate Guard Malloc lines in test outputBrad King2015-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When RunCMake tests run under Xcode Guard Malloc, Guard Malloc may add lines of the form "<tool>(<pid>) malloc:..." to the output. Remove such lines from the actual output before matching it against the expected output.
| * | | | | Tests: Teach RunCMake to tolerate BullseyeCoverage lines in test outputBrad King2015-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When RunCMake tests run under dynamic analysis, Bullseye may add lines of the form "BullseyeCoverage..." to the output. Remove such lines from the actual output before matching it against the expected output.
| * | | | | Tests: Match curl error in RunCMake.ctest_submit FailDrop-* casesBrad King2015-02-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port the regexes over from the CTestTestFailedSubmit tests for ftp, http, and https. No such match is needed for the other protocols.
| * | | | | Tests: Rename RunCMake.{CTestMemcheck => ctest_memcheck}Brad King2015-02-1985-30/+30
| | | | | | | | | | | | | | | | | | | | | | | | Follow the convention of naming tests after the command they test.
| * | | | | Tests: Rename RunCMake.{CTestSubmit => ctest_submit}Brad King2015-02-1962-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | Follow the convention of naming tests after the command they test.
| * | | | | Tests: Split RunCTest helper out of RunCMake.CTest(Submit|Memcheck)Brad King2015-02-194-31/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide the "run_ctest" macro for use in other tests that also want to cover running "ctest" scripts.
| * | | | | Tests: Rename RunCMake.CTestMemcheck internals to match CTestSubmitBrad King2015-02-194-12/+12
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2015-02-241-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge branch 'release'Brad King2015-02-230-0/+0
|\ \ \ \ \ | |_|_|/ / |/| | | |