summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Add AUTORCC configuration change testSebastian Holtermann2018-05-3011-0/+94
|
* Autogen: Let AUTORCC generate output for all configurationsSebastian Holtermann2018-05-301-2/+14
| | | | | | | | | | | | For multi configuration generators let AUTORCC generate the rcc output for all configurations. This is a workaround for the incomplete `$<CONFIG>` support in the DEPENDS and OUTPUT clauses of a custom_command/custom_target. Since we can't depend on the per-config rcc output file we somehow must ensure the successful rcc build for one configuration doesn't shadow the need to rcc rebuild for a second configuration. Closes #18006
* Autogen: Add lock file to AUTORCC commandsSebastian Holtermann2018-05-306-9/+62
| | | | | By using a per .qrc lock file in AUTORCC, the same `cmake -E cmake_autorcc ...` command can be called concurrently.
* CMake Nightly Date StampKitware Robot2018-05-301-1/+1
|
* Merge topic 'parallel_build_option'Brad King2018-05-2950-100/+424
|\ | | | | | | | | | | | | | | 1ab3881ec9 cmake: Add options for parallel builds to --build mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !1962
| * cmake: Add options for parallel builds to --build modeFlorian Maushart2018-05-2550-100/+424
| | | | | | | | | | | | | | While we already support `cmake --build . -- -j`, the options after `--` are specific to the native build tool. Add new options `--parallel [<N>]` and `-j [<N>]` to abstract this and map to the proper option for the native build tool.
* | Merge topic 'cuda-unused-placeholder'Brad King2018-05-292-7/+7
|\ \ | | | | | | | | | | | | | | | | | | edf0ea9bb2 CUDA: Drop unused/broken platform link flags placeholder Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2108
| * | CUDA: Drop unused/broken platform link flags placeholderBrad King2018-05-252-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `<CMAKE_CUDA_LINK_FLAGS>` placeholder in CUDA rule variables comes from the `<CMAKE_CXX_LINK_FLAGS>` placeholder from which the CUDA rule variables were originally derived. It is not a public interface for adding link flags so no projects should be using it. It is needed for platform information modules to specify platform-specific link flags for the language. None of our platform modules set it, so it is unused. Furthermore, it is broken as currently implemented. Some of the contexts in which it is used need `-Xlinker` and some do not. Therefore it is not possible to use the placeholder at all. Simply remove it for now. If some need for platform-specific CUDA link flags arises a new solution will be needed.
* | | 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
* | | | Merge topic 'bootstrap_ccache_tweak'Brad King2018-05-291-4/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f994d9fdc bootstrap: Use ccache in script-generated makefile Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2107
| * | | | bootstrap: Use ccache in script-generated makefileShane Parris2018-05-251-4/+6
| | | | |
* | | | | Merge topic 'doxygen-all'Craig Scott2018-05-293-2/+62
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b2f440e2b FindDoxygen: Add tests for ALL option 79b29b732c FindDoxygen: add optional ALL argument Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2099
| * | | | | FindDoxygen: Add tests for ALL optionCraig Scott2018-05-272-0/+52
| | | | | |
| * | | | | FindDoxygen: add optional ALL argumentDavid Demelier2018-05-241-2/+10
| | | | | |
* | | | | | 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-272-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18021
* | | | | | | CMake Nightly Date StampKitware Robot2018-05-271-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-05-261-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'FindPerl-strawberry'Brad King2018-05-251-0/+1
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | b37d583d5c FindPerl: Add support for Strawberry Perl Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2102
| * | | | | FindPerl: Add support for Strawberry PerlLauri2018-05-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #18027
* | | | | | Merge topic 'FindLua-conventional-paths'Brad King2018-05-2510-47/+221
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5d19260f9 FindLua: Search for lua.h using more conventional paths 9455512d22 FindLua: Add tests for this module Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2095
| * | | | | | FindLua: Search for lua.h using more conventional pathsAlexander Grund2018-05-241-47/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not constrain the search to `include/*`. To provide compatibility the foreach-loop is still used. However `include/xxx` and `xxx` is now both searched. This honors now e.g. CMAKE_INCLUDE_PATH. Fixes: #17999
| * | | | | | FindLua: Add tests for this moduleAlexander Grund2018-05-249-0/+134
| | | | | | |
* | | | | | | 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
* | | | | | | | Merge topic 'FindODBC-module'Brad King2018-05-258-0/+274
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 357db10bd1 FindODBC: Add module to search for ODBC library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2069
| * | | | | | | FindODBC: Add module to search for ODBC libraryMateusz Loskot2018-05-228-0/+274
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Add tests for FindODBC module.
* | | | | | | 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.
* | | | | | | Merge topic 'FindBZip2-imported-include-dirs'Brad King2018-05-241-6/+18
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0887c993aa FindBZip2: Populate BZIP2_INCLUDE_DIRS result variable a8bf1ea5b7 FindBZip2: Format result variable docs as definition list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2097
| * | | | | | FindBZip2: Populate BZIP2_INCLUDE_DIRS result variableBrad King2018-05-221-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The plural-named non-cached result variable is needed to follow our module conventions documented in `cmake-developer(7)`. The variable is also used to populate our ``BZip2::BZip2`` imported target include directories, which was broken without this variable set. Fixes: #18013
| * | | | | | FindBZip2: Format result variable docs as definition listBrad King2018-05-221-7/+10
| | |_|/ / / | |/| | | |
* | | | | | 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 'cpackrpm-fix-docs'Brad King2018-05-211-12/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 78f0dcdcc9 CPackRPM: Fix misleading CPACK_RPM_SPEC_INSTALL_POST docs 2ae2f0ca98 CPackRPM: Minor formatting cleanup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2070
| * | | CPackRPM: Fix misleading CPACK_RPM_SPEC_INSTALL_POST docsCraig Scott2018-05-121-7/+11
| | | |
| * | | CPackRPM: Minor formatting cleanupCraig Scott2018-05-121-5/+5
| | | |
* | | | Merge topic 'eclipse-custom-content'Brad King2018-05-214-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-184-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-215-6/+37
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-215-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | 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