summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-synopsis-markup'Brad King2018-04-194-5/+5
|\ | | | | | | | | | | | | 909ab169eb Help: Fix command-line synopsis markup syntax Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1981
| * Help: Fix command-line synopsis markup syntaxBrad King2018-04-184-5/+5
| | | | | | | | | | | | Use `{}` to surround required parts instead of `()`. Fixes: #17917
* | Merge topic '17870-effective-system-name'Brad King2018-04-1943-66/+73
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 4597396784 Apple: Use include_guard() within compiler config e95b3fd9bb Apple: Use CMAKE_EFFECTIVE_SYSTEM_NAME to share compiler info 84f9f63fcc Modules: Introduce CMAKE_EFFECTIVE_SYSTEM_NAME to lookup compiler info 9fa0f2eb56 CMakeFindPackageMode: Perform platform-specific initialization Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1964
| * | Apple: Use include_guard() within compiler configGregor Jasny2018-04-184-16/+4
| | |
| * | Apple: Use CMAKE_EFFECTIVE_SYSTEM_NAME to share compiler infoGregor Jasny2018-04-1835-38/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apple platforms macOS, iOS, tvOS, and watchOS can all share the same compiler information. Rename `Darwin-*` modules to `Apple-*` and load them all through `CMAKE_EFFECTIVE_SYSTEM_NAME`. This saves duplication of 4 * 21 compiler information modules. Issue: #17870
| * | Modules: Introduce CMAKE_EFFECTIVE_SYSTEM_NAME to lookup compiler infoGregor Jasny2018-04-188-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | Create a `CMAKE_EFFECTIVE_SYSTEM_NAME` variable to use for looking up compiler information modules instead of using `CMAKE_SYSTEM_NAME` directly. This will allow multiple platforms to share the same set of compiler information modules without spelling out all of them. Issue: #17870
| * | CMakeFindPackageMode: Perform platform-specific initializationBrad King2018-04-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~565^2~3 (Add platform-specific initialization step when enabling languages, 2014-04-29) the main enable-language logic includes the `CMakeSystemSpecificInitialize` module to perform platform-specific initialization based on `CMAKE_SYSTEM_NAME`. This should be done during `cmake --find-package` mode too.
* | | CMake Nightly Date StampKitware Robot2018-04-191-1/+1
| | |
* | | Merge topic 'android-ndk-r17'Brad King2018-04-183-8/+43
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | da294a039d Android: Add support for NDK r17 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1976
| * | Android: Add support for NDK r17Brad King2018-04-173-8/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | The `armeabi` ABI is no longer available, so we can no longer use it by default unconditionally. Instead detect all available ABIs and choose the oldest arm ABI that is available. Also update the test suite to account for the lack of `armeabi` support and pass as of Android NDK r17-beta2.
* | | Merge topic 'fix-findmpi-lib-regex'Christian Pfeiffer2018-04-181-6/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bab4bc5f32 FindMPI: Fix libname regex to not match the compiler executable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1952
| * | | FindMPI: Fix libname regex to not match the compiler executableChuck Atkins2018-04-121-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When trying to match full path libraries on the mpicc link line, the current regex is not strict enough and improperly matches a partial path to the Xcode compiler path with homebrew mpich. This adjusts the regex to look for a space preceeding the library name to prevent the first argument, i.e. the compiler invocation, from being matched, and require either a space or end-pattern after the library to prevent mismatches with arguments that contain the library suffix but don't actually end with it.
* | | | CMake Nightly Date StampKitware Robot2018-04-181-1/+1
| | | |
* | | | Merge topic 'FindOpenSSL-components'Craig Scott2018-04-171-19/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 912a6c1cb5 FindOpenSSL: Add component support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1929
| * | | | FindOpenSSL: Add component supportHarry Mallon2018-04-161-19/+46
| | | | |
* | | | | Merge topic 'typo-incerment'Brad King2018-04-171-1/+1
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | fbf330ce2b typo: incerment -> increment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1977
| * | | | typo: incerment -> incrementRolf Eike Beer2018-04-171-1/+1
|/ / / /
* | | | Merge branch 'release-3.11'Brad King2018-04-170-0/+0
|\ \ \ \
| * | | | CMake 3.11.1v3.11.1Brad King2018-04-171-1/+1
| | | | |
* | | | | Merge branch 'release-3.11'Brad King2018-04-170-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'bootstrap_system_libuv_option' into release-3.11Brad King2018-04-171-2/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1971
* | \ \ \ \ 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
generated by cgit v0.12 at 2025-01-30 20:06:00 (GMT)