summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-old-express-no-folders'Brad King2016-04-278-17/+28
|\ | | | | | | | | | | 571bedec VS: Ignore USE_FOLDER property on VS versions that do not support it 0c58d2d0 VS: Detect VS 8 and 9 Express editions
| * VS: Ignore USE_FOLDER property on VS versions that do not support itBrad King2016-04-267-13/+16
| | | | | | | | | | Solution folders are supported on VS 8 and above in the full versions and on VS 11 and above in the express versions.
| * VS: Detect VS 8 and 9 Express editionsBrad King2016-04-264-4/+12
| |
* | CMake Nightly Date StampKitware Robot2016-04-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-04-261-1/+1
|/
* CMake Nightly Date StampKitware Robot2016-04-251-1/+1
|
* CMake Nightly Date StampKitware Robot2016-04-241-1/+1
|
* CMake Nightly Date StampKitware Robot2016-04-231-1/+1
|
* Merge topic 'fix-bison-flex-command-escaping'Brad King2016-04-223-6/+18
|\ | | | | | | | | | | | | fd73bb60 Help: Add notes for topic 'fix-bison-flex-command-escaping' f56a0ddd FindBISON: Fix BISON_TARGET macro for special characters in path (#16072) 3d13492e FindFLEX: Fix FLEX_TARGET macro for special characters in path (#16072)
| * Help: Add notes for topic 'fix-bison-flex-command-escaping'Brad King2016-04-201-0/+12
| |
| * FindBISON: Fix BISON_TARGET macro for special characters in path (#16072)Brad King2016-04-201-4/+4
| | | | | | | | | | Use the VERBATIM option to add_custom_command so that the command is escaped correctly.
| * FindFLEX: Fix FLEX_TARGET macro for special characters in path (#16072)Brad King2016-04-201-2/+2
| | | | | | | | | | Use the VERBATIM option to add_custom_command so that the command is escaped correctly.
* | Merge topic 'autogen-updates'Brad King2016-04-2224-63/+545
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84946c73 Tests: QtAutogen: Same source name in different directories test 9c6fa684 Autogen: Generate qrc_NAME.cpp files in subdirectories 488ea8c7 Autogen: Generate not included moc files in subdirectories (#12873) 66caae45 Autogen: Check added for name collisions of generated qrc_NAME.cpp files 663d093d Autogen: Check added for name collisions of generated ui_NAME.h files 8295d437 Autogen: Check added for name collisions of generated moc files d350308a Help: Improve AUTOMOC documentation layout
| * | Tests: QtAutogen: Same source name in different directories testSebastian Holtermann2016-04-2219-0/+234
| | | | | | | | | | | | | | | | | | | | | The test features multiple .cpp and .qrc files with the same name in different subdirectories. This requires AUTOMOC and AUTORCC to generate files with names that respect the path information of the source files.
| * | Autogen: Generate qrc_NAME.cpp files in subdirectoriesSebastian Holtermann2016-04-222-36/+109
| | | | | | | | | | | | | | | | | | | | | A qrc_NAME.cpp file generated from NAME.qrc in the directory CMAKE_CURRENT_SOURCE_DIR/SUBDIR will be generated in the directory CMAKE_CURRENT_BINARY_DIR/TARGETNAME_automoc.dir/SUBDIR
| * | Autogen: Generate not included moc files in subdirectories (#12873)Sebastian Holtermann2016-04-222-11/+63
| | | | | | | | | | | | | | | | | | | | | Not included moc files generated from a source file in CMAKE_CURRENT_SOURCE_DIR/SUBDIR will be generated in the directory CMAKE_CURRENT_BINARY_DIR/TARGETNAME_automoc.dir/SUBDIR/
| * | Autogen: Check added for name collisions of generated qrc_NAME.cpp filesSebastian Holtermann2016-04-221-0/+14
| | |
| * | Autogen: Check added for name collisions of generated ui_NAME.h filesSebastian Holtermann2016-04-221-0/+16
| | |
| * | Autogen: Check added for name collisions of generated moc filesSebastian Holtermann2016-04-224-1/+87
| | | | | | | | | | | | | | | The test exits with an error if two or more source files would generate the same moc file.
| * | Help: Improve AUTOMOC documentation layoutBrad King2016-04-221-16/+23
| | |
* | | Merge topic 'xcode-c_str'Brad King2016-04-222-55/+54
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2263949b cmGlobalXCodeGenerator: do not pass char* to cmSystemTools::CollapseFullPath() 2b25ce30 make cmGlobalXCodeGenerator::XCodeEscapePath() take a std::string& ffedf352 make cmGlobalXCodeGenerator::BuildObjectListOrString::Add() take a string& 6100bdff cmGlobalXCodeGenerator: directly call CreateString() with std::string
| * | | cmGlobalXCodeGenerator: do not pass char* to cmSystemTools::CollapseFullPath()Rolf Eike Beer2016-04-201-1/+1
| | | | | | | | | | | | | | | | | | | | This takes a std::string&, so directly pass the object to it instead of converting back and forth.
| * | | make cmGlobalXCodeGenerator::XCodeEscapePath() take a std::string&Rolf Eike Beer2016-04-202-18/+17
| | | | | | | | | | | | | | | | | | | | All callers already have one, and it was immediately converted to one internally. Just keep the old one around, and only modify it when needed.
| * | | make cmGlobalXCodeGenerator::BuildObjectListOrString::Add() take a string&Rolf Eike Beer2016-04-201-5/+5
| | | | | | | | | | | | | | | | | | | | All callers already have these objects, and it is only passed to other methods taking such, so avoid all conversions in between.
| * | | cmGlobalXCodeGenerator: directly call CreateString() with std::stringRolf Eike Beer2016-04-201-33/+33
| | |/ | |/| | | | | | | | | | This function already takes a const std::string&, no need to convert the input to a char* before passing it in.
* | | Merge topic 'addcachedefinitions-convert'Brad King2016-04-221-10/+11
|\ \ \ | | | | | | | | | | | | | | | | 068358e1 cmMakefile::AddCacheDefinition: avoid conversions between char* and string
| * | | cmMakefile::AddCacheDefinition: avoid conversions between char* and stringRolf Eike Beer2016-04-201-10/+11
| |/ / | | | | | | | | | | | | | | | | | | Running the testsuite this function is entered more than 126,000 times. Reorder the code flow so that a conversion from char* to std::string is only done when the cache entry is a path one, which happens only ~50 times during the testsuite.
* | | CMake Nightly Date StampKitware Robot2016-04-221-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-04-211-1/+1
|/ /
* | Merge topic 'coverage_collect_delete'Brad King2016-04-201-2/+6
|\ \ | | | | | | | | | | | | 5de122df CTestCoverageCollectGCOV: improve DELETE option
| * | CTestCoverageCollectGCOV: improve DELETE optionZack Galbreath2016-04-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The DELETE option to ctest_coverage_collect_gcov now properly removes all the .gcov files that were created by this function. Previously it left behind any files that were excluded by CTEST_CUSTOM_COVERAGE_EXCLUDE. This option now also deletes the following files/directory that are created by ctest_coverage_collect_gcov: data.json coverage_file_list.txt the uncovered/ directory
* | | Merge topic 'boost-import-default'Brad King2016-04-205-2/+32
|\ \ \ | | | | | | | | | | | | | | | | 2c1b720e FindBoost: Define Boost::boost for all boost versions
| * | | FindBoost: Define Boost::boost for all boost versionsRoger Leigh2016-04-195-2/+32
| |/ /
* | | Merge topic 'BundleUtilities-optional-exclude'Brad King2016-04-201-37/+115
|\ \ \ | | | | | | | | | | | | | | | | 26c92d50 BundleUtilities: Add optional parameter to ignore specified files
| * | | BundleUtilities: Add optional parameter to ignore specified filesRoman Wüger2016-04-191-37/+115
| | | |
* | | | Merge topic 'autogen-cleanups'Brad King2016-04-202-177/+288
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 840b830b Autogen: Qrc processing: Generate single map with final input / output names bc4c7751 Autogen: Ui processing: Generate single map with final input / output names 47e60bc5 Autogen: Split out UI file generation code to dedicated method cf679ea8 Autogen: Split out moc file generation code to dedicated method 3ea1d090 Autogen: Rename method GenerateQrc{ => Files} 8ced8bb9 Autogen: New logCommand method. It prints commands using std::cout. 95064a6d Autogen: Rename header extension Join method to JoinExts 7a73c404 Autogen: Use SystemTools string functions instead of rolling out own
| * | | Autogen: Qrc processing: Generate single map with final input / output namesSebastian Holtermann2016-04-192-46/+76
| | | |
| * | | Autogen: Ui processing: Generate single map with final input / output namesSebastian Holtermann2016-04-192-18/+42
| | | | | | | | | | | | | | | | The single map allows name collision testing (in a later commit)
| * | | Autogen: Split out UI file generation code to dedicated methodSebastian Holtermann2016-04-192-12/+28
| | | |
| * | | Autogen: Split out moc file generation code to dedicated methodSebastian Holtermann2016-04-192-54/+107
| | | |
| * | | Autogen: Rename method GenerateQrc{ => Files}Sebastian Holtermann2016-04-192-3/+3
| | | |
| * | | Autogen: New logCommand method. It prints commands using std::cout.Sebastian Holtermann2016-04-192-21/+25
| | | |
| * | | Autogen: Rename header extension Join method to JoinExtsSebastian Holtermann2016-04-192-6/+10
| | | | | | | | | | | | | | | | While at it, simplify the signature and avoid a trailing separator.
| * | | Autogen: Use SystemTools string functions instead of rolling out ownSebastian Holtermann2016-04-192-22/+2
| |/ /
* | | CMake Nightly Date StampKitware Robot2016-04-201-1/+1
| |/ |/|
* | CMake Nightly Date StampKitware Robot2016-04-191-1/+1
|/
* Merge topic 'refactor-cmListFileBacktrace'Brad King2016-04-1815-248/+269
|\ | | | | | | | | | | | | | | | | 0f96ef00 Remove unused cmake::IssueMessage overload 563bf9dd cmState: Remove unused entry point fields from snapshot data 7c36d206 cmListFileBacktrace: Refactor storage to provide efficient value semantics 1f6bd8a9 cmState: Avoid accumulating snapshot storage for backtraces 18b6676b cmState: Add Snapshot method to get bottom of call stack
| * Remove unused cmake::IssueMessage overloadBrad King2016-04-182-38/+0
| | | | | | | | | | | | All callers now pass a full backtrace so we do not need the alternative that takes a cmListFileContext directly. Drop this overload to remove the code duplication.
| * cmState: Remove unused entry point fields from snapshot dataBrad King2016-04-182-14/+0
| | | | | | | | This information is now kept in cmMakefile::Backtrace.
| * cmListFileBacktrace: Refactor storage to provide efficient value semanticsBrad King2016-04-1813-192/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.0-rc1~321^2~2 (Genex: Store a backtrace, not a pointer to one, 2015-07-08) we treat cmListFileBacktrace instances as lightweight values. This was true at the time only because the backtrace information was kept in the cmState snapshot hierarchy. However, that forced us to accumulate a lot of otherwise short-lived snapshots just to have the backtrace fields available for reference by cmListFileBacktrace instances. Recent refactoring made backtrace instances independent of the snapshot hierarchy to avoid accumulating short-lived snapshots. This came at the cost of making backtrace values heavy again, leading to lots of string coying and slower execution. Fix this by refactoring cmListFileBacktrace to provide value semantics with efficient shared storage underneath. Teach cmMakefile to maintain its call stack using an instance of cmListFileBacktrace. This approach allows the current backtrace to be efficiently saved whenever it is needed. Also teach cmListFileBacktrace the notion of a file-level scope. This is useful for messages about the whole file (e.g. during parsing) that are not specific to any line within it. Push the CMakeLists.txt scope for each directory and never pop it. This ensures that we always have some context information and simplifies cmMakefile::IssueMessage. Push/pop a file-level scope as each included file is processed. This supersedes cmParseFileScope and improves diagnostic message context information in a few places. Fix the corresponding test cases to expect the improved output.