summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2014-11-281-1/+1
|
* CMake Nightly Date StampKitware Robot2014-11-271-1/+1
|
* Merge topic 'break-command-strictness'Brad King2014-11-267-1/+145
|\ | | | | | | | | | | d54617d0 break: Add policy CMP0055 to check calls strictly bae604d9 Track nested loop levels in CMake language with a stack of counters
| * break: Add policy CMP0055 to check calls strictlyGregor Jasny2014-11-253-1/+73
| | | | | | | | | | | | Reject break() without loop scope or any arguments. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
| * Track nested loop levels in CMake language with a stack of countersGregor Jasny2014-11-254-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | It gets incremented while entering a loop block (e.g. foreach or while) and gets decremented when leaving the block. Because scope borders for example at function borders must be taken into account the counter is put into a stack. With every new scope an empty counter is pushed on the stack, when leaving the scope the original value is restored. This will allow easy querying if the break command is properly nested within a loop scope. Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | Merge topic 'ccmake-system-form'Brad King2014-11-261-3/+15
|\ \ | | | | | | | | | | | | 6b045c3b ccmake: Add CMAKE_USE_SYSTEM_FORM option to use libform instead of cmForm
| * | ccmake: Add CMAKE_USE_SYSTEM_FORM option to use libform instead of cmFormÅdne Hovda2014-11-251-3/+15
| |/
* | CMake Nightly Date StampKitware Robot2014-11-261-1/+1
|/
* Merge topic 'remove-ancient-msvc-workarounds'Brad King2014-11-256-50/+4
|\ | | | | | | | | | | | | | | | | | | | | 12cb0b86 Help: Update developer manual with some C++ features now permitted. ba74465f cmGeneratorTarget: Remove MSVC7 workaround 41363c0c VisualStudio: Remove MSVC6 compatibility macro. 4efcfe52 cmSystemTools: Remove MSVC6 compatibility define. 5f4695cd cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro. 7a064337 cmFindCommon: Remove MSVC6 workaround for nested struct private access. fdb73547 cmTarget: Remove std::min and std::max MSVC6 compatibility code.
| * cmGeneratorTarget: Remove MSVC7 workaroundStephen Kelly2014-11-201-20/+0
| | | | | | | | Use partial specialization everywhere.
| * VisualStudio: Remove MSVC6 compatibility macro.Stephen Kelly2014-11-201-6/+0
| |
| * cmSystemTools: Remove MSVC6 compatibility define.Stephen Kelly2014-11-201-3/+1
| |
| * cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro.Stephen Kelly2014-11-201-2/+1
| |
| * cmFindCommon: Remove MSVC6 workaround for nested struct private access.Stephen Kelly2014-11-201-7/+0
| |
| * cmTarget: Remove std::min and std::max MSVC6 compatibility code.Stephen Kelly2014-11-201-12/+2
| | | | | | | | CMake is no longer required to build with MSVC6.
* | Merge topic 'remove-c_str'Brad King2014-11-2526-59/+59
|\ \ | | | | | | | | | | | | 5eb4d759 Remove some unneeded c_str calls.
| * | Remove some unneeded c_str calls.Stephen Kelly2014-11-2326-59/+59
| | |
* | | Merge topic 'fortran-linker-flags'Brad King2014-11-253-5/+61
|\ \ \ | | | | | | | | | | | | | | | | 17b0fe03 Fix incremental linking setting for Fortran + VS
| * | | Fix incremental linking setting for Fortran + VSZack Galbreath2014-11-213-5/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes a bug where it was impossible to specify /INCREMENTAL to Fortran projects built with Visual Studio. The problem was due to the fact that .vfproj files expect the value of this flag to be "linkIncremental{No,Yes}, whereas .vcproj files expect this value to be 0, 1, or 2. The implementation of this fix adds a new data structure for Visual Studio linker flags specific to Fortran. This can easily be extended in the future if more such discrepencies between C/C++ and Fortran linking are discovered.
* | | | Merge topic 'cmTarget-null_ptr-everywhere'Brad King2014-11-251-19/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 32a191ce cmTarget: Use null_ptr code path on all platforms
| * | | | cmTarget: Use null_ptr code path on all platformsBrad King2014-11-201-19/+2
| | |_|/ | |/| | | | | | | | | | | | | | This reduces conversions asked of the compiler. Also drop 'static' from the declaration of the local null_ptr helper.
* | | | Merge topic 'file-GENERATE-rerun'Brad King2014-11-251-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 26e98c34 file(GENERATE): Re-run cmake when appropriate.
| * | | | file(GENERATE): Re-run cmake when appropriate.Stephen Kelly2014-11-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-run if the input file changes or if the output file is removed. This only works with the Makefile generators currently. The limitation of the Ninja generator is tracked as issue #15256. The IDE generators will need larger refactoring as they currently rely on being able to determine the depends and output files at the start of generate-time, which is too early for the file(GENERATE) case.
* | | | | Merge topic 'clean-autogen'Brad King2014-11-251-4/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3bd59b60 QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible. bf00f528 QtAutogen: Don't take a reference to temporary.
| * | | | | QtAutogen: Use cmHasLiteral{Prefix,Suffix} where possible.Stephen Kelly2014-11-181-3/+3
| | | | | |
| * | | | | QtAutogen: Don't take a reference to temporary.Stephen Kelly2014-11-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | While a const reference to a temporary is standard conformant, it doesn't seem to be necessary or advantageous here.
* | | | | Merge topic 'ccmake-hpux'Brad King2014-11-257-64/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a687292 ccmake: Cleanup and simplify conditional blocks for HP-UX 44f02b42 ccmake: Use standard getmaxyx instead of non-standard getmax[xy] ee3d06a4 ccmake: Remove incomplete support for cur_colr on old HP-UX
| * | | | | ccmake: Cleanup and simplify conditional blocks for HP-UXÅdne Hovda2014-11-185-42/+13
| | | | | |
| * | | | | ccmake: Use standard getmaxyx instead of non-standard getmax[xy]Ådne Hovda2014-11-183-22/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Swap out getmax[xy]() calls for single call to getmaxyx(), to support strict X/Open conformant curses implementations, e.g. HP-UX Xcurses.
| * | | | | ccmake: Remove incomplete support for cur_colr on old HP-UXÅdne Hovda2014-11-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | Enable support for the more modern Xcurses.
* | | | | Merge topic 'custom-command-byproducts'Brad King2014-11-2519-30/+210
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 557aef0b ExternalProject: Add options to specify BYPRODUCTS (#14963) e15a7075 Add an option for explicit BYPRODUCTS of custom commands (#14963)
| * | | | | Add an option for explicit BYPRODUCTS of custom commands (#14963)Brad King2014-11-1419-30/+210
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A common idiom in CMake-based build systems is to have custom commands that generate files not listed explicitly as outputs so that these files do not have to be newer than the inputs. The file modification times of such "byproducts" are updated only when their content changes. Then other build rules can depend on the byproducts explicitly so that their dependents rebuild when the content of the original byproducts really does change. This "undeclared byproduct" approach is necessary for Makefile, VS, and Xcode build tools because if a byproduct were listed as an output of a rule then the rule would always rerun when the input is newer than the byproduct but the byproduct may never be updated. Ninja solves this problem by offering a 'restat' feature to check whether an output was really modified after running a rule and tracking the fact that it is up to date separately from its timestamp. However, Ninja also stats all dependencies up front and will only restat files that are listed as outputs of rules with the 'restat' option enabled. Therefore an undeclared byproduct that does not exist at the start of the build will be considered missing and the build will fail even if other dependencies would cause the byproduct to be available before its dependents build. CMake works around this limitation by adding 'phony' build rules for custom command dependencies in the build tree that do not have any explicit specification of what produces them. This is not optimal because it prevents Ninja from reporting an error when an input to a rule really is missing. A better approach is to allow projects to explicitly specify the byproducts of their custom commands so that no phony rules are needed for them. In order to work with the non-Ninja generators, the byproducts must be known separately from the outputs. Add a new "BYPRODUCTS" option to the add_custom_command and add_custom_target commands to specify byproducts explicitly. Teach the Ninja generator to specify byproducts as outputs of the custom commands. In the case of POST_BUILD, PRE_LINK, and PRE_BUILD events on targets that link, the byproducts must be specified as outputs of the link rule that runs the commands. Activate 'restat' for such rules so that Ninja knows it needs to check the byproducts, but not for link rules that have no byproducts.
* | | | | | CMake Nightly Date StampKitware Robot2014-11-251-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-11-241-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-231-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-221-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-11-211-1/+1
| |_|/ / |/| | |
* | | | CMake Nightly Date StampKitware Robot2014-11-201-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-11-191-1/+1
| |/ / |/| |
* | | Merge topic 'vs-check-phone-store-tools'Brad King2014-11-187-35/+242
|\ \ \ | | | | | | | | | | | | | | | | | | | | 689cd0d4 VS: Do not produce WinMD file for OBJECT libraries (#15228) b20a32ac VS: Improve error messages when compiler is not detected (#15228)
| * | | VS: Do not produce WinMD file for OBJECT libraries (#15228)Gilles Khouzam2014-11-171-1/+2
| | | | | | | | | | | | | | | | | | | | They are implemented as static libraries for the IDE so treat them the same.
| * | | VS: Improve error messages when compiler is not detected (#15228)Gilles Khouzam2014-11-146-34/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake requires both the Desktop SDK and the correct platform SDK (Windows Phone or Windows Store) to be installed when targeting the Windows mobile platforms. Verify that the right platform components are installed and give a more detailed error message when something is wrong.
* | | | CMake Nightly Date StampKitware Robot2014-11-181-1/+1
| | | |
* | | | Merge topic 'ninja-minor-refactoring'Brad King2014-11-174-33/+26
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | 67bd514a Ninja: Refactor restat to be a string internally ef42e57d Ninja: Use a TARGET_FILE variable to hold the link output file 592644c4 Tests/BuildDepends: Drop unneeded help for Ninja
| * | | Ninja: Refactor restat to be a string internallyBrad King2014-11-144-15/+15
| | | | | | | | | | | | | | | | | | | | This will allow values other than "" and "1" to be generated in the rules.ninja file.
| * | | Ninja: Use a TARGET_FILE variable to hold the link output fileBrad King2014-11-141-18/+11
| | | | | | | | | | | | | | | | | | | | | | | | Use an explicit "$TARGET_FILE" variable instead of "$out" so that we can have multiple output files while still only referencing the main one in command lines.
* | | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-11-171-1/+1
| | | |
* | | | Merge topic 'console-pool'Brad King2014-11-1713-33/+111
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d75d7e5 Help: Add notes for topic 'console-pool' f42d86f0 Ninja: Implement USES_TERMINAL using the console pool if available f281ae01 Ninja: Remove unused declaration d5eae556 Ninja: factor out the test for console pool support 4d1fedf4 Give the interactive cache editor the USES_TERMINAL property fe5d6e8c Add USES_TERMINAL option for custom commands ad6ee426 Rename doing_verbatim to doing_nothing
| * | | Ninja: Implement USES_TERMINAL using the console pool if availablePeter Collingbourne2014-11-144-0/+13
| | | |
| * | | Ninja: Remove unused declarationPeter Collingbourne2014-11-141-1/+0
| | | |