summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'vs-raii-implement'Brad King2018-05-291-130/+42
|\ | | | | | | | | | | | | | | e7e25c6cb6 cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement() 726c090297 cmVisualStudio10TargetGenerator: close XML tag in Elem destructor Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2109
| * cmVisualStudio10TargetGenerator: Remove empty Elem::EndElement()Vitaly Stakhovsky2018-05-251-125/+31
| | | | | | | | The method no longer does anything. Remove it and remove calls to it.
| * cmVisualStudio10TargetGenerator: close XML tag in Elem destructorVitaly Stakhovsky2018-05-251-6/+12
| | | | | | | | RAII actually implemented; EndElement() still kept to avoid major reformatting
* | CMake Nightly Date StampKitware Robot2018-05-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-05-281-1/+1
| |
* | Merge topic 'cmake-D-option-help'Craig Scott2018-05-271-1/+1
|\ \ | | | | | | | | | | | | | | | | | | 42738e5075 Help: Update description of the -D option to CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2105
| * | Help: Update description of the -D option to CMakeRaul Laasner2018-05-241-1/+1
| | | | | | | | | | | | Fixes #18021
* | | CMake Nightly Date StampKitware Robot2018-05-271-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2018-05-261-1/+1
| |/ |/|
* | Merge topic 'vs-scope'Brad King2018-05-251-19/+29
|\ \ | | | | | | | | | | | | | | | | | | 45c4a75d27 cmVisualStudio10TargetGenerator: make sure each Elem has right scope Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2096
| * | cmVisualStudio10TargetGenerator: make sure each Elem has right scopeVitaly Stakhovsky2018-05-221-19/+29
| | | | | | | | | | | | Prepare for future RAII
* | | CMake Nightly Date StampKitware Robot2018-05-251-1/+1
| |/ |/|
* | Merge topic 'revise-case-insensitive-command'Brad King2018-05-2410-41/+64
|\ \ | | | | | | | | | | | | | | | | | | b1a05d6c76 Revise implementation of case-insensitive command names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2024
| * | Revise implementation of case-insensitive command namesFlorian Jacomme2018-05-2210-41/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Store both the as-written and lower-case command names and use the latter to avoid case-insensitive string comparisons. With this I obtain 2-6% speed increase (on Windows) for the configure step with no significant changes in memory usage. A case-insensitive comparison is a lot slower than just calling `==` because the operator will use things like memcmp, so prefer the latter. The `cmSystemTools::LowerCase` function allocates a new string each time it is called, so before this change we were allocating in: * cmMakefile::Configure two times for each function (to look for `cmake_minimum_required` and `project`) * cmMakefile::ExecuteCommand twice by function by calling cmState::GetCommand and copying the name Now we are only allocating once by function instead of four.
* | | CMake Nightly Date StampKitware Robot2018-05-241-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2018-05-231-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2018-05-221-1/+1
| |/ |/|
* | Merge topic 'pr.copy_data_check'Brad King2018-05-211-8/+18
|\ \ | | | | | | | | | | | | | | | | | | a203fcc63d cmake: Teach '-E tar' to report errors copying data Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2075
| * | cmake: Teach '-E tar' to report errors copying dataRuslan Baratov2018-05-181-8/+18
| |/ | | | | | | | | The `copy_data` function checks for errors but the caller ignored them. Simplify its return type and add a check to the caller.
* | Merge topic 'eclipse-custom-content'Brad King2018-05-211-0/+7
|\ \ | | | | | | | | | | | | | | | | | | fd0da95f63 Eclipse: Add property to include additional contents in .cproject file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2088
| * | Eclipse: Add property to include additional contents in .cproject fileMelanie Cappelaere2018-05-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Similar to ECLIPSE_EXTRA_NATURES which can be used to add a third party nature to the .project, this property offers the possibility to inject third party contents into the .cproject. An example of where this is useful is MCUXpresso. This is an IDE based on Eclipse. Compiling through CMake generated Eclipse projects works fine by using a custom toolchain. However, in order to be able to debug using such a project, an extra storageModule specific to the target board is needed in the cproject.
* | | Merge topic 'PDBDirectoryGenExpression'Brad King2018-05-211-2/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 79ca546ed2 Add generator expression support to PDB_OUTPUT_DIRECTORY target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2083
| * | | Add generator expression support to PDB_OUTPUT_DIRECTORY target propertyMarian Klymov2018-05-211-2/+13
| | | | | | | | | | | | | | | | Fixes: #16365
* | | | Merge topic 'vs-remove-stream'Brad King2018-05-212-389/+393
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 790fc415b1 cmVisualStudio10TargetGenerator: remove BuildFileStream member Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2082
| * | | | cmVisualStudio10TargetGenerator: remove BuildFileStream memberVitaly Stakhovsky2018-05-162-389/+393
| |/ / / | | | | | | | | | | | | Stream object is now local to `Generate()`
* | | | Merge topic 'update-kwsys'Brad King2018-05-213-41/+86
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b730097788 Merge branch 'upstream-KWSys' into update-kwsys 1f52cb087a KWSys 2018-05-18 (5357cfc4) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2090
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-05-183-41/+86
| | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-05-18 (5357cfc4)
* | | | | CMake Nightly Date StampKitware Robot2018-05-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-05-201-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-05-191-1/+1
|/ / / /
* | | | CMake Nightly Date StampKitware Robot2018-05-181-1/+1
| | | |
* | | | Merge topic 'makefile-ar-limits'Brad King2018-05-171-4/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6c49713b3 Makefile: Fix command line limits for static libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2078
| * | | | Makefile: Fix command line limits for static libsViktor Mukha2018-05-161-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have been hitting the Windows command-line limit when cross-compiling static library (POCO) and having more than 8000 characters in the call to "ar". Calculating exact limits here are tricky, since this particular limit will only take into account object file strings, which is correct for response files, but not for the archive rules (link.txt files), since they also contain the call to "ar" and its arguments. Also, there can be other additional arguments if "ar" tool is wrapped into something else, so it is a good idea to leave more space than trying to exactly fit the limit. Since response files use half of the limit as a heuristic, we reproduce it here for consistency.
* | | | | Merge topic 'pr.file_write_check'Brad King2018-05-171-0/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2db4945150 file(WRITE): Report errors during write operation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2076
| * | | | | file(WRITE): Report errors during write operationRuslan Baratov2018-05-161-0/+8
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | We already report an error if the file cannot be opened for writing. Add another check to report an error if a write operation itself fails.
* | | | | Merge topic 'update-kwsys'Brad King2018-05-172-2/+35
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3333e2791b Help: Add release note about 'copy_directory' behavior change 24367563d7 Merge branch 'upstream-KWSys' into update-kwsys 1e0a2e9377 KWSys 2018-05-15 (5f757898) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2080
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-05-162-2/+35
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-05-15 (5f757898) Fixes: #16001
* | | | CMake Nightly Date StampKitware Robot2018-05-171-1/+1
| |_|/ |/| |
* | | Merge topic 'subdirectory-linking'Brad King2018-05-161-2/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c9349cc1b9 target_link_libraries: Allow use with targets in other directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2040
| * | | target_link_libraries: Allow use with targets in other directoriesPatrick Stotko2018-05-151-2/+9
| | |/ | |/| | | | | | | | | | | | | | | | | | | Previously the command did not allow naming targets on the LHS that were not created in the calling directory. Lift this restriction to enable more flexible use by projects. Fixes: #17943
* | | Merge topic 'dotnet_target_fw_init'Brad King2018-05-162-4/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 71a033616a added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2032
| * | | added CMAKE_DOTNET_TARGET_FRAMEWORK_VERSION variableMichael Stürmer2018-05-152-4/+15
| | | | | | | | | | | | | | | | Fixes: #17955
* | | | Merge topic 'vs-nitpicks'Brad King2018-05-162-74/+70
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | b88e138369 cmVisualStudio10TargetGenerator: minor code cleanup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2063
| * | | cmVisualStudio10TargetGenerator: minor code cleanupVitaly Stakhovsky2018-05-112-74/+70
| | | |
* | | | CMake Nightly Date StampKitware Robot2018-05-161-1/+1
| |_|/ |/| |
* | | Merge topic 'autogen_register_info_files'Brad King2018-05-151-0/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e461a136c1 Autogen: Register generated dependency files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2071
| * | | Autogen: Register generated dependency filesSebastian Holtermann2018-05-141-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | For CMP0058 record that rcc info files are generated by CMake. Fixes: #17985
* | | | Merge topic 'custom-command-expand-empty'Brad King2018-05-151-0/+8
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 6e59491659 add_custom_{command,target}: Fix crash on empty expanded command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2074
| * | | add_custom_{command,target}: Fix crash on empty expanded commandBrad King2018-05-141-0/+8
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our custom command generation logic assumes that all command lines have at least `argv0`. In `add_custom_{command,target}` we already check that at least a `COMMAND` was given, but using `COMMAND_EXPAND_LISTS` in combination with a generator expression that expands to an empty string may produce an empty command line. In this case simply add an empty string as a command to maintain our internal invariant. Fixes: #17993
* | | CMake Nightly Date StampKitware Robot2018-05-151-1/+1
| | |