summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'bootstrap_system_libuv_option'Brad King2018-04-171-2/+4
|\ | | | | | | | | | | | | bbf64794ac bootstrap: Add option to enable/disable usage of system libuv Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1971
| * bootstrap: Add option to enable/disable usage of system libuvKirill Erofeev2018-04-171-2/+4
| |
* | Merge topic 'list-TRANSFORM'Brad King2018-04-17106-109/+1426
|\ \ | | | | | | | | | | | | | | | | | | | | | dca2347980 list: Add TRANSFORM sub-command cdae12f8f8 string() Refactoring: creates an helper for REGEX REPLACE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1938
| * | list: Add TRANSFORM sub-commandMarc Chevrier2018-04-16100-0/+1224
| | | | | | | | | | | | Issue: #17823
| * | string() Refactoring: creates an helper for REGEX REPLACEMarc Chevrier2018-04-166-109/+202
| | |
* | | Merge topic 'FindOpenAL-std-includes'Brad King2018-04-171-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3d9d1c9dcf FindOpenAL: Find AL/al.h or OpenAL/al.h in standard include paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1963
| * | | FindOpenAL: Find AL/al.h or OpenAL/al.h in standard include pathsJames Jones2018-04-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add `AL` and `OpenAL` to the `PATH_SUFFIXES` so that they are searched within the standard system include directories. We already have `include/AL`, `include/OpenAL`, and `include` to help out within the locations specified by `PATHS`, though it is unclear why it was done this way instead of adding the suffixes to all the `PATHS` explicitly.
* | | | Merge topic 'vs-conditional-reference-assembly'Brad King2018-04-171-4/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c8e98974d8 VS: Disallow ReferenceOutputAssembly in ProjectReference if not possible Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1956
| * | | | VS: Disallow ReferenceOutputAssembly in ProjectReference if not possibleBastien Schatt2018-04-131-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly turn off `ReferenceOutputAssembly` in `ProjectReference` elements naming other project files whose types do not produce assemblies. We already do this for `C#` but it makes sense for other languages too. Fixes: #17906
* | | | | Merge branch 'release-3.11'Brad King2018-04-170-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'FindOpenMP-Intel-Windows' into release-3.11Brad King2018-04-161-13/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1957
| * \ \ \ \ \ Merge branch 'implicit-lib-gcceh-file' into release-3.11Brad King2018-04-162-1/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1967
| * \ \ \ \ \ \ Merge branch 'libuv_version_bump' into release-3.11Brad King2018-04-161-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1966
* | \ \ \ \ \ \ \ Merge topic 'FindOpenMP-Intel-Windows'Brad King2018-04-171-13/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c7433e874 FindOpenMP: Fix support for Intel on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1957
| * | | | | | | | FindOpenMP: Fix support for Intel on WindowsRoland Schulz2018-04-161-13/+4
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~334^2 (FindOpenMP: Use NO_DEFAULT_PATH where appropriate, 2017-11-15) broke partial support for Intel on Windows. Since `OpenMP_${LANG}_IMPLICIT_LINK_DIRS` is empty for this compiler the `find_library` call without `NO_DEFAULT_PATH` worked accidentally in environments with the needed libraries in the search path already. Fix support for Intel on Windows by simply removing our explicit search for the `libiomp5md` library. In cases that it is needed, the compiler already inserts metadata in `.obj` files to tell the MSVC linker to use the library. Suggested-by: Christian Pfeiffer <cpfeiffer@live.de> Fixes: #17910
* | | | | | | | Merge topic 'implicit-lib-gcceh-file'Brad King2018-04-172-1/+7
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb0498357f Exclude "libgcc_eh" library files from implicit link libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1967
| * | | | | | | Exclude "libgcc_eh" library files from implicit link librariesBrad King2018-04-162-1/+7
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix in commit v3.9.6~1^2 (Restore exclusion of "gcc_eh" from implicit link libraries, 2017-11-07) to also exclude `gcc_eh` libraries referenced by absolute path to the library file. Issue: #17436
* | | | | | | Merge topic 'libuv_version_bump'Brad King2018-04-171-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5f72ff844 Explicitly require LibUV 1.10 or higher to build CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1966
| * | | | | | Explicitly require LibUV 1.10 or higher to build CMakeErofeevK2018-04-161-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | CMake 3.11 now uses `uv_translate_sys_error` introduced in LibUV 1.10.
* | | | | | CMake Nightly Date StampKitware Robot2018-04-171-1/+1
| | | | | |
* | | | | | Merge topic 'cuda-compiler-loaded'Brad King2018-04-161-0/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 595aa12811 CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1955
| * | | | | | CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabledHenry Schreiner2018-04-131-0/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | We already do this for C, CXX, Fortran, etc.
* | | | | | Merge topic 'vs-cuda-pdb'Brad King2018-04-165-0/+51
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 134e795fa9 VS: Add workaround for CUDA compiler PDB location Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1960
| * | | | | | VS: Add workaround for CUDA compiler PDB locationBrad King2018-04-135-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CUDA Toolkit Visual Studio Integration does not honor the `ClCompile.ProgramDataBaseFileName` field when telling `nvcc` how to invoke `cl`. Work around this problem by passing `-Xcompiler=-Fd...` ourselves through `AdditionalOptions`. Fixes: #17647
* | | | | | | Merge topic 'test-ExternalData-dedup'Brad King2018-04-162-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb66cea6c5 Tests: Avoid duplicate rules in ExternalData test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1958
| * | | | | | | Tests: Avoid duplicate rules in ExternalData testBrad King2018-04-132-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.7.0-rc1~158^2 (ExternalData: Tolerate files duplicated across multiple targets, 2016-07-07) we added a test case for repeating the same data file reference in three different targets in the same directory in order to exercise its corresponding fix. However, we re-used the top-level `Data.dat` file which is already produced by an unrelated test case. `ninja` diagnoses the duplicate rule. Update the test to use a dedicated data file name for the three-times repeated case to avoid this conflict. It still covers the original purpose of the test.
* | | | | | | | Merge branch 'release-3.11'Brad King2018-04-160-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'backport-fix-explicit-CMakeLists.txt' into release-3.11Brad King2018-04-1310-9/+91
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1959
* | \ \ \ \ \ \ \ Merge topic 'fix-explicit-CMakeLists.txt'Brad King2018-04-1610-9/+91
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a122393d7 Merge branch 'backport-fix-explicit-CMakeLists.txt' 8480c2afc0 Restore support for explicitly referenced CMakeLists.txt sources Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1959
| * | | | | | | | Merge branch 'backport-fix-explicit-CMakeLists.txt'Brad King2018-04-1310-9/+91
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Restore support for explicitly referenced CMakeLists.txt sourcesBrad King2018-04-1310-9/+91
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.11.0-rc1~467^2 (VS,Xcode: Add CMakeLists.txt sources without mutating targets, 2017-10-18) we do not add `CMakeLists.txt` to target sources but instead generate references to them directly. This broke projects that explicitly specify their `CMakeLists.txt` file as a source file because the explicit entry is no longer consolidated with the generated one. Teach the relevant generators to avoid duplicating `CMakeLists.txt` source references and add test cases. Fixes: #17828
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-161-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-04-151-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-04-141-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'clang-cl-std'Brad King2018-04-131-5/+42
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3f82c5904d Clang: Add standard flags support when simulating MSVC 8381bc12ad Clang: Avoid extra C++ feature detection when simulating MSVC 6cddf7ba32 Clang: Refactor standard flags logic when simulating MSVC Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1906
| * | | | | Clang: Add standard flags support when simulating MSVCRuben Van Boxem2018-04-111-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When Clang 3.9 simulates MSVC 19.0 or higher it knows the `-std:` flags that such versions of MSVC defines. Fixes: #17866
| * | | | | Clang: Avoid extra C++ feature detection when simulating MSVCBrad King2018-04-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the optimization from commit v3.10.0-rc1~131^2 (MSVC: Avoid unnecessary C++ feature detection steps, 2017-09-11) to the case of Clang simulating a version of MSVC that does not define standards. Issue: #17274
| * | | | | Clang: Refactor standard flags logic when simulating MSVCBrad King2018-04-111-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Consolidate the compile options and standard defaults branches. Add comments.
* | | | | | Merge topic 'update-kwsys'Brad King2018-04-131-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ebbf2807b Merge branch 'upstream-KWSys' into update-kwsys e488f73873 KWSys 2018-04-12 (9da3e5bc) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1953
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-04-121-2/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-04-12 (9da3e5bc)
| | * | | | KWSys 2018-04-12 (9da3e5bc)KWSys Upstream2018-04-121-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 9da3e5bc847fa4187f42f60700e343a9ed09a161 (master). Upstream Shortlog ----------------- Brad King (1): c7ef6c1b SystemInformation: Do not include unnecessary fenv.h
* | | | | | CMake Nightly Date StampKitware Robot2018-04-131-1/+1
| | | | | |
* | | | | | Merge topic 'doc-dev-mr-edit'Craig Scott2018-04-121-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | fc7e1de188 CONTRIBUTING: Mention GitLab option to allow edits from maintainers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1954
| * | | | | CONTRIBUTING: Mention GitLab option to allow edits from maintainersBrad King2018-04-121-0/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | Collaboration between contributors and developers is easier if a developer can push an update to a contributor's MR source branch.
* | | | | Merge branch 'release-3.11'Brad King2018-04-120-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch 'features-msvc-2017' into release-3.11Brad King2018-04-111-21/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1903
* | \ \ \ \ Merge topic 'add_support_for_clr_targets'Brad King2018-04-1215-24/+188
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 312527de47 document COMMON_LANGUAGE_RUNTIME target properties 4b7a82b4ed cmVisualStudio10TargetGenerator: set /clr compiler flag from property 20e31fb4c9 cmExportFileGenerator: add target property for managed targets 411a22706a cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary() fb433ff283 cmGeneratorTarget: Make import library checks config-aware 4c1f33961f cmGeneratorTarget: add GetManagedType() and CheckManagedType() methods 6c517a9f8d cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1916
| * | | | | | document COMMON_LANGUAGE_RUNTIME target propertiesMichael Stürmer2018-04-094-0/+37
| | | | | | |
| * | | | | | cmVisualStudio10TargetGenerator: set /clr compiler flag from propertyMichael Stürmer2018-04-051-0/+16
| | | | | | |
| * | | | | | cmExportFileGenerator: add target property for managed targetsMichael Stürmer2018-04-051-0/+14
| | | | | | |
generated by cgit v0.12 at 2025-02-03 00:57:25 (GMT)