summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Help: Improve formatting and cross-references for find_package()Craig Scott2020-05-201-6/+6
|
* Merge topic 'doc-CMAKE_SYSTEM_PREFIX_PATH'Craig Scott2020-05-205-1/+49
|\ | | | | | | | | | | | | 6b3d8f281e Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4748
| * Document which environment variables effect CMAKE_SYSTEM_PREFIX_PATHRobert Maynard2020-05-195-1/+49
| |
* | CMake Nightly Date StampKitware Robot2020-05-201-1/+1
| |
* | Merge topic 'src-named-for-config'Brad King2020-05-1914-203/+184
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70c85c1d6f Tests: Add case for source files named with CONFIG genex 3b547e2e4b VS: Simplify logic adding source file C/C++ language flag to MSVC 27ead9d4b7 VS: Compute managed type from an existing configuration 1222327c89 VS: Write custom commands for sources from all configurations 65fe58a4b4 cmVisualStudio10TargetGenerator: Adopt Windows Store and Phone infrastructure 3fa3b7a402 cmGeneratorTarget: Remove default config from Get* methods d6a88d2158 cmTarget: Replace "perConfig" constructor boolean with enum Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4761
| * | Tests: Add case for source files named with CONFIG genexBrad King2020-05-181-0/+7
| | | | | | | | | | | | | | | | | | | | | This is now expected to work on all generators where the test runs. Recent ancestors of this commit fix the Visual Studio generator. Fixes: #20648
| * | VS: Simplify logic adding source file C/C++ language flag to MSVCBrad King2020-05-181-21/+7
| | | | | | | | | | | | | | | | | | Do not add a target-wide language flag. We need a flag on an individual source file to explicitly specify the C or C++ language if and only if the source file extension does not imply it.
| * | VS: Compute managed type from an existing configurationBrad King2020-05-181-1/+2
| | | | | | | | | | | | | | | | | | It is not clear how multiple configurations should be handled here, but using an existing configuration is at least better than the empty configuration.
| * | VS: Write custom commands for sources from all configurationsBrad King2020-05-181-8/+14
| | |
| * | cmVisualStudio10TargetGenerator: Adopt Windows Store and Phone infrastructureBrad King2020-05-184-147/+119
| | | | | | | | | | | | | | | Move support for Resx, Xaml, Certificate, and AppManifest file handling out of cmGeneratorTarget.
| * | cmGeneratorTarget: Remove default config from Get* methodsBrad King2020-05-185-13/+16
| | | | | | | | | | | | Ensure all call sites pass an explicit configuration.
| * | cmTarget: Replace "perConfig" constructor boolean with enumBrad King2020-05-186-13/+19
| | |
* | | Merge topic 'simplify_cmPropertyDefinitionMap'Brad King2020-05-198-117/+64
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6728f0fa85 cmPropertyDefinitionMap: simplify and shorten Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4753
| * | | cmPropertyDefinitionMap: simplify and shortenTushar Maheshwari2020-05-158-117/+64
| | | |
* | | | Merge topic 'FindHDF5-cleanup'Brad King2020-05-191-232/+244
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8fa58aea77 FindHDF5: Clean variables and output Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4759
| * | | | FindHDF5: Clean variables and outputSeth R Johnson2020-05-181-232/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The module's functionality is preserved. Perform cleanups: - Format some functions - Change macros to functions - Fix return value check from execute_process - Hide status messages unless HDF5_FIND_DEBUG is enabled - Normalize TRUE/FALSE capitalization Fixes: #20718
* | | | | Merge topic 'add_test-special-chars-in-name'Brad King2020-05-1958-15/+383
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f84af8e270 add_test: Allow special characters in test name Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4754
| * | | | | add_test: Allow special characters in test nameDeniz Bahadir2020-05-1758-15/+383
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19391
* | | | | | CMake Nightly Date StampKitware Robot2020-05-191-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'fetchcontent-SOURCE_SUBDIR'Brad King2020-05-185-14/+81
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 592085b94b FetchContent: Add support for SOURCE_SUBDIR Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4757
| * | | | | FetchContent: Add support for SOURCE_SUBDIRCraig Scott2020-05-165-14/+81
| |/ / / / | | | | | | | | | | Fixes: #19875
* | | | | Merge topic 'cuda-clang'Brad King2020-05-1824-299/+444
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a653ca9504 Tests: Update CUDA tests to work with Clang 5df21adf46 CUDA: Add support for Clang compiler dc2eae1f91 FindCUDAToolkit: Factor out discovery code into a separate file 70be10cbf4 CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIA Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Artem Belevich <tra@google.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Acked-by: Axel Huebl <axel.huebl@plasma.ninja> Acked-by: friendnick <ikoval67@gmail.com> Acked-by: Patrik Huber <patrikhuber@gmail.com> Merge-request: !4442
| * | | | | Tests: Update CUDA tests to work with ClangRaul Tambre2020-05-1512-48/+70
| | | | | |
| * | | | | CUDA: Add support for Clang compilerRaul Tambre2020-05-1510-23/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When crosscompiling we pass the sysroot. We need to try various architecture flags. Clang doesn't automatically select one that works. First try the ones that are more likely to work for modern installations: * <=sm_50 is deprecated since CUDA 10.2, try sm_52 first for future compatibility. * <=sm_20 is removed since CUDA 9.0, try sm_30. Otherwise fallback to Clang's current default. Currently that's `sm_20`, the lowest it supports. Separable compilation isn't supported yet. Fixes: #16586
| * | | | | FindCUDAToolkit: Factor out discovery code into a separate fileRaul Tambre2020-05-152-218/+233
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows for re-use in other parts of the code, that require the CUDA toolkit location, but can't or may not want to use the full `FindCUDAToolkit`.
| * | | | | CUDA: Remove toolkit include dirs from implicit include dirs only with NVIDIABrad King2020-05-151-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The special case added by commit 87df637078 (CUDA: Do not treat CUDA toolkit include directories as implicit, 2020-02-02, v3.17.0-rc1~31^2) breaks CMake's protections against changing the compiler's implicit include directory order. Do this only for the NVIDIA compiler where it is needed as a workaround to another problem. That compiler does not put the host compiler's implicit include directories in `-I` paths so we do not detect them as `CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES` anyway.
* | | | | | Merge topic 'compile_opts'Brad King2020-05-183-5/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 448e2d7a9d Help: Provide cross-references between compiler settings 1f697b3991 Help: COMPILE_OPTIONS: bundle cross refs, add example Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4749
| * | | | | | Help: Provide cross-references between compiler settingsJoachim Wuttke (h)2020-05-143-0/+10
| | | | | | |
| * | | | | | Help: COMPILE_OPTIONS: bundle cross refs, add exampleJoachim Wuttke (h)2020-05-141-5/+11
| | | | | | |
* | | | | | | Merge branch 'release-3.16'Brad King2020-05-180-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'fix-ClearSourcesCache' into release-3.16Brad King2020-05-151-0/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4751
* | \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-05-180-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge topic 'fix-ClearSourcesCache' into release-3.17Brad King2020-05-181-0/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4751
* | | | | | | | | | Merge topic 'fix-ClearSourcesCache'Brad King2020-05-181-0/+1
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9f4f58f0c cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCache Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4751
| * | | | | | | | | cmGeneratorTarget: Clear AllConfigSources in ClearSourcesCacheBrad King2020-05-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 40aa6c059c (cmGeneratorTarget: Add method to collect all sources for all configs, 2017-04-10, v3.9.0-rc1~268^2~5) we forgot to update `ClearSourcesCache` to also clear `AllConfigSources`. This leads to subtle cases where code paths like PCH handling that add sources during generation break depending on ordering. Suggested-by: Christian Fersch Fixes: #20712, #20702
* | | | | | | | | | Merge topic 'FindOpenSSL-applink'Brad King2020-05-181-0/+47
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b83ca816a FindOpenSSL: add target OpenSSL::applink to support OpenSSL's applink feature Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4737
| * | | | | | | | | | FindOpenSSL: add target OpenSSL::applink to support OpenSSL's applink featuregnaggnoyil2020-05-151-0/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20701
* | | | | | | | | | | Merge topic 'fix-CheckTargetsForMissingSources'Brad King2020-05-182-1/+15
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 25995b2b30 cmGlobalGenerator: Fix CheckTargetsForMissingSources after refactoring Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4747
| * | | | | | | | | | | cmGlobalGenerator: Fix CheckTargetsForMissingSources after refactoringBrad King2020-05-152-1/+15
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 01b2d6ab74 (Modernize: Use ranged for-loops when possible, 2019-02-07, v3.15.0-rc1~575^2) accidentally changed a loop condition in this method from "keep iterating if srcs.empty()" to "stop iterating if srcs.empty()". Switch it back. The bug could only manifest in very subtle conditions in a multi-config generator. Add one such case to the test suite. Fixes: #20706
* | | | | | | | | | | Merge topic 'find-doxygen-parallel-tests'Craig Scott2020-05-181-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cb8f7e3aad FindDoxygen: Prevent tests from interfering with each other Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4756
| * | | | | | | | | | | FindDoxygen: Prevent tests from interfering with each otherCraig Scott2020-05-161-0/+2
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When doing something like ctest -j8, the FindDoxygen.SimpleTest test case would execute multiple doxygen sub-tests that then try to create/write to the same output directory.
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-181-1/+1
| | | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-171-1/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-161-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge branch 'release-3.16'Brad King2020-05-150-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16Brad King2020-05-151-0/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !4752
* | \ \ \ \ \ \ \ Merge branch 'release-3.17'Brad King2020-05-150-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | |
| * | | | | | | | Merge topic 'backport-3.16-FindPkgConfig-isystem' into release-3.17Brad King2020-05-151-0/+6
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4752
* | | | | | | | | Merge topic 'backport-3.16-FindPkgConfig-isystem'Brad King2020-05-151-0/+6
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3719ddd3f3 Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fix Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4752
| * | | | | | | | Help: Add 3.16.7 release note for FindPkgConfig '-isystem' fixBrad King2020-05-151-0/+6
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a release note for the change in commit 4d446c68d1 (FindPkgConfig: also handle "-isystem" prefixes for include directories, 2020-04-30).