summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'test-CheckIPOSupported'Brad King2017-04-1910-0/+99
|\ | | | | | | | | | | | | eeb58c5c Tests: Add cases for typical CheckIPOSupported usage Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !700
| * Tests: Add cases for typical CheckIPOSupported usageRuslan Baratov2017-04-1810-0/+99
| |
* | Merge topic 'fix-CMakeTestAllGenerators'Brad King2017-04-192-49/+11
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 9e338b57 Tests: Drop machine-specific logic from CMakeTestAllGenerators 2790ffc9 Tests: Run CMakeTestAllGenerators serially f1e51ec3 Tests: Fix CMakeTestAllGenerators generator list Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !720
| * | Tests: Drop machine-specific logic from CMakeTestAllGeneratorsBrad King2017-04-181-22/+0
| | | | | | | | | | | | | | | | | | Drop hard-coded paths from this test. If we later need machine-specific environment entries we can add dedicated infrastructure for it to be configured locally.
| * | Tests: Run CMakeTestAllGenerators seriallyBrad King2017-04-181-0/+3
| | | | | | | | | | | | | | | This test may take a long time because it runs many other tools. Do not make it compete with other tests for resources.
| * | Tests: Fix CMakeTestAllGenerators generator listBrad King2017-04-181-27/+8
| | | | | | | | | | | | | | | | | | | | | | | | Since `cmake --help` output now uses `[arch]` placeholders for the VS generators, this test has been extracting invalid generator names. Switch to using `cmake -E capabilities` to get a more robust listing of the generators that does not depend on parsing human-readable help output.
* | | Merge topic 'doc-CMAKE_MATCH_n'Brad King2017-04-195-24/+49
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb08e1fe Help: Document CMAKE_MATCH_<n> variables 8dd99752 Help: Link from if(MATCHES) to regex specification docs a0091a69 Help: Format string() command regex specification docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !719
| * | | Help: Document CMAKE_MATCH_<n> variablesBrad King2017-04-185-4/+17
| | | |
| * | | Help: Link from if(MATCHES) to regex specification docsBrad King2017-04-182-1/+3
| | | |
| * | | Help: Format string() command regex specification docsBrad King2017-04-181-20/+30
| |/ /
* | | Merge topic 'findmpi-add-imported-targets'Brad King2017-04-197-0/+113
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ed9f635 FindMPI: Add test case 86979bb5 FindMPI: Add IMPORTED targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !707
| * | | FindMPI: Add test caseChristian Pfeiffer2017-04-186-0/+84
| | | |
| * | | FindMPI: Add IMPORTED targetsChristian Pfeiffer2017-04-161-0/+29
| | | |
* | | | Merge topic 'doc-find-path-sep'Brad King2017-04-192-2/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3022545f Help: Document find command search path separators Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !718
| * | | | Help: Document find command search path separatorsBrad King2017-04-182-2/+8
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | The `find_*` commands read search paths from both CMake variables and from environment variables. Document how multiple values in these variables should be separated. Fixes: #16800
* | | | Merge topic 'cmake-gui-desktop-icon-wayland'Brad King2017-04-192-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86787633 cmake-gui: Fix display of icon under Wayland. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !715
| * | | | cmake-gui: Fix display of icon under Wayland.Clinton Stimpson2017-04-172-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #16797
* | | | | CMake Nightly Date StampKitware Robot2017-04-191-1/+1
| |/ / / |/| | |
* | | | Merge topic 'tcc-enable_exports'Brad King2017-04-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 11ab003b TinyCC: Support ENABLE_EXPORT property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !711
| * | | | TinyCC: Support ENABLE_EXPORT propertyhsc2017-04-171-0/+1
| |/ / / | | | | | | | | Replace the default -Wl,--export-dynamic with -rdynamic.
* | | | Merge topic 'ipo-var-per-config'Brad King2017-04-184-7/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 470437f6 Support CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG> Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !709
| * | | | Support CMAKE_INTERPROCEDURAL_OPTIMIZATION_<CONFIG>Ruslan Baratov2017-04-184-7/+17
| | | | |
* | | | | Merge topic 'cpackifw-search-algorithm'Brad King2017-04-182-6/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 049be8b9 CPackIFW: Added new QtIFW versions for search d97978b8 CPackIFW: Improved QtIFW search algorithm Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !674
| * | | | | CPackIFW: Added new QtIFW versions for searchKonstantin Podsvirov2017-04-152-0/+7
| | | | | |
| * | | | | CPackIFW: Improved QtIFW search algorithmKonstantin Podsvirov2017-04-152-6/+47
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | Improvements: - Added new hint CPACK_IFW_ROOT variable; - Extend documentation.
* | | | | Merge topic 'findmpi-mark-library-advanced'Brad King2017-04-181-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9d280f5 FindMPI: Mark old MPI library entries as advanced Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !708
| * | | | | FindMPI: Mark old MPI library entries as advancedChristian Pfeiffer2017-04-161-0/+1
| |/ / / /
* | | | | Merge topic 'fix-CMP0026-old'Brad King2017-04-183-0/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e616fcf CMP0026: Fix OLD behavior with file written during configure step Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !710
| * | | | | CMP0026: Fix OLD behavior with file written during configure stepBrad King2017-04-173-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 60307c5056 (cmGeneratorTarget: Replace source classifier implementation, 2017-04-07) accidentally regressed support for CMP0026's OLD behavior in the case of a source file written by project code during the configure step after getting a LOCATION. We should not perform full source classification until the generate step because files written by the project's configure step may not exist yet. Add special logic to support this case. Add a test case for it. Reported-by: David Stoup <david.stoup@kitware.com>
* | | | | | CMake Nightly Date StampKitware Robot2017-04-181-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'prepare-per-config-objects'Brad King2017-04-177-83/+192
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ca697bfc cmGeneratorTarget: Drop obj libs from GetConfigCommonSourceFiles e44a8d2c Xcode: Refactor loop over all sources 97cc29c7 VS: Teach generators how to mark per-config source files 2f6f6f0c Xcode: Use config-specific object library files on link lines 888c8af6 VS: List config-specific object library files on link lines 40aa6c05 cmGeneratorTarget: Add method to collect all sources for all configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !701
| * | | | | cmGeneratorTarget: Drop obj libs from GetConfigCommonSourceFilesBrad King2017-04-132-2/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Call sites such as those in the VS global generator that are used only to reject per-config sources will now allow per-config object library objects. The corresponding generators have already been taught to deal with per-config object library files. Remaining call sites do not need object library files anyway. This will later allow `$<TARGET_OBJECTS:...>` generator expressions to evaluate to values that vary by configuration (e.g. because each configuration has its own object files).
| * | | | | Xcode: Refactor loop over all sourcesBrad King2017-04-131-33/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switch from `GetConfigCommonSourceFiles` to `GetAllConfigSources`. This will allow us to drop object library files from the former.
| * | | | | VS: Teach generators how to mark per-config source filesBrad King2017-04-134-36/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add internal infrastructure for looping over all sources for all configurations and generating each source with exclusion marks for configurations in which they do not participate. This does not yet make per-config sources available in general but does set up some of the needed infrastructure. Unfortunately doing this cleanly will require major refactoring of both the VS 7-9 generators and the VS 10+ generators (for separate reasons). Instead add some extra internal structures to carry information where we need it.
| * | | | | Xcode: Use config-specific object library files on link linesBrad King2017-04-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can do this only with Xcode 5 and above where we list the object library files in the per-config link line value. On older Xcode versions we list the object files as sources so that dependencies work correctly, but that does not allow per-config objects. (Xcode may allow per-config source exclusion but only by base name.)
| * | | | | VS: List config-specific object library files on link linesBrad King2017-04-131-11/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases that we need to list object library files on link lines, look up the set of files matching the configuration of each link line.
| * | | | | cmGeneratorTarget: Add method to collect all sources for all configsBrad King2017-04-132-0/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi-config generators like VS and Xcode need to loop over all the source files first and then handle per-config information within each one. Teach cmGeneratorTarget to provide such a view.
* | | | | | Merge topic 'file-copy-relative-from'Brad King2017-04-1710-10/+89
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99b90dbf file: Add COPY/INSTALL option for fixed layout relative to a directory dadf1570 file: Refactor COPY/INSTALL relative path handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !703
| * | | | | | file: Add COPY/INSTALL option for fixed layout relative to a directoryBrad King2017-04-1310-1/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `FILES_FROM_DIR` option to install a specific set of files specified relative to a given directory and preserve their layout in the destination. Currently we intend to use this internally to implement other things so we don't provide an `install()` porcelain or documentation yet.
| * | | | | | file: Refactor COPY/INSTALL relative path handlingBrad King2017-04-131-10/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | Delay conversion to absolute path until the last moment.
* | | | | | Merge topic 'iwyu-mapping'Brad King2017-04-172-0/+147
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2b0a47c Add include-what-you-use mapping Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !692
| * | | | | | Add include-what-you-use mappingDaniel Pfeifer2017-04-132-0/+147
| |/ / / / /
* | | | | | Merge topic 'simpler-import-lib-check'Brad King2017-04-171-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a5dcc32 cmExportBuildFileGenerator: use HasImportLibrary Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !699
| * | | | | | cmExportBuildFileGenerator: use HasImportLibraryBen Boeckel2017-04-131-3/+1
| | | | | | |
* | | | | | | Merge topic 'vs-custom-kits-dir'Brad King2017-04-173-13/+44
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fee01194 VS: Add an environment variable for the Windows 10 kits directory b80c6d12 VS: Refactor Win 10 Kits root detection to support multiple roots Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !696
| * | | | | | | VS: Add an environment variable for the Windows 10 kits directoryBrad King2017-04-123-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a `CMAKE_WINDOWS_KITS_10_DIR` environment variable to allow users to tell CMake about a custom Windows 10 SDK directory. We choose to make this an environment variable rather than a CMake variable or cache entry because: * Using a custom directory also requires custom external MSBuild configuration. Therefore users are already configuring a custom environment. * The custom directory must be set consistently in all parts of a build including nested projects. An environment variable avoids requiring users to thread the setting into nested builds. Fixes: #16743
| * | | | | | | VS: Refactor Win 10 Kits root detection to support multiple rootsBrad King2017-04-121-13/+25
| |/ / / / / /
* | | | | | | CMake Nightly Date StampKitware Robot2017-04-171-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2017-04-161-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-04-151-1/+1
| |_|_|/ / |/| | | |