summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'ninja-simplify-paths'Brad King2018-04-203-34/+10
|\ | | | | | | | | | | | | 5650ba1d6a Ninja: Drop unnecessary ident encoding logic for paths Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1983
| * Ninja: Drop unnecessary ident encoding logic for pathsBrad King2018-04-193-34/+10
| | | | | | | | | | | | The only uses of `EncodeIdent` are surrounding `EncodePath`, but the special ident encoding is not needed for path contexts in a ninja build manifest.
* | Merge topic 'FindPython-debian-cross-comp'Brad King2018-04-201-15/+23
|\ \ | | | | | | | | | | | | | | | | | | | | | 7855e4d6b7 FindPython: Add cross-compilation support for Debian-based systems. Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@sap.com> Merge-request: !1961
| * | FindPython: Add cross-compilation support for Debian-based systems.Yee Fan2018-04-181-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Debian-based Linux distributions locate their architecture-specific pythonX.Y-config tool at /usr/bin/<arch>-python<X.Y>-config. We first attempt to find and use the architecture-specific pythonX.Y-config tool. If the pythonX.Y-config tools are absent, then we proceed to find the architecture-specific Python libraries. Fixes: #17912
* | | Merge topic 'doc-drop-faq'Brad King2018-04-201-7/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0055d50667 Help: Drop direct link to Wiki/FAQ page Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1986
| * | | Help: Drop direct link to Wiki/FAQ pageBrad King2018-04-191-7/+3
| | | | | | | | | | | | | | | | | | | | Instead mention that community resources are available on the general documentation landing page.
* | | | Merge topic 'doc-xref-envvar'Craig Scott2018-04-203-0/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63e0c16e3d Help: Link from CMAKE_<LANG>_FLAGS to <LANG>FLAGS environment variables 8acf46caf1 Utilities/Sphinx: Add role and directive for 'envvar' in CMake domain 7e532abc78 Utilities/Sphinx: Fix QtHelp generator identifiers Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Robert Maynard <robert.maynard@kitware.com> Merge-request: !1985
| * | | | Help: Link from CMAKE_<LANG>_FLAGS to <LANG>FLAGS environment variablesBrad King2018-04-191-0/+11
| | | | |
| * | | | Utilities/Sphinx: Add role and directive for 'envvar' in CMake domainBrad King2018-04-192-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables cross-reference syntax for CMake environment variables: :envvar:`SOMEVAR` and definition of CMake environment variables via a directive: .. envvar:: SOMEVAR It also adds environment variables defined by the directive and by `Help/envvar/SOMEVAR.rst` documents to the index. This `envvar` role and directive is defined in our `cmake` domain and overrides the equivalent `envvar` role and directive provided by Sphinx in its default domain. This is okay because we build CMake documents in the `cmakd` domain. This follows up the work from commit v3.10.0-rc1~43^2 (Help: Document CMake's environment variables, 2017-09-01) that originally added `envvar` documentation.
| * | | | Utilities/Sphinx: Fix QtHelp generator identifiersBrad King2018-04-191-0/+1
| |/ / / | | | | | | | | | | | | Add missinge entry in `create_identifiers.py` helper.
* | | | CMake Nightly Date StampKitware Robot2018-04-201-1/+1
|/ / /
* | | Merge topic 'FindJPEG-imported-targets'Brad King2018-04-197-16/+153
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 87f2cf3b1c FindJPEG: Add imported target support and full test 13952a3b7f FindJPEG: Add multi config support and associated docs 1f6649b7d1 FindJPEG: Add version detection and associated test update and docs 8d07408a62 FindJPEG: Cleanup documentation formatting e70da3f0f3 FindJPEG: Clean up whitepaces and lowercase function names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1974
| * | | FindJPEG: Add imported target support and full testMateusz Loskot2018-04-186-2/+88
| | | |
| * | | FindJPEG: Add multi config support and associated docsMateusz Loskot2018-04-171-2/+22
| | | |
| * | | FindJPEG: Add version detection and associated test update and docsMateusz Loskot2018-04-172-2/+27
| | | |
| * | | FindJPEG: Cleanup documentation formattingMateusz Loskot2018-04-171-9/+15
| | | |
| * | | FindJPEG: Clean up whitepaces and lowercase function namesMateusz Loskot2018-04-171-5/+5
| | | |
* | | | Merge branch 'release-3.11'Brad King2018-04-190-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'InstallRequiredSystemLibraries-mfcm' into release-3.11Brad King2018-04-181-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1980
* | \ \ \ \ Merge topic 'InstallRequiredSystemLibraries-mfcm'Brad King2018-04-191-0/+8
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bdf660cab5 InstallRequiredSystemLibraries: Check for existence of mfcm dlls Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1980
| * | | | | InstallRequiredSystemLibraries: Check for existence of mfcm dllsChristof Krüger2018-04-181-0/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, only existence of `mfc${v}.dll` and `mfc${v}d.dll` variants was checked and it was assumed that the managed variants `mfcm*.dll` also existed. This assumption doesn't hold with Visual Studio 2017. Check each file separately. Fixes: #17913
* | | | | Merge topic 'depfile-flag'Brad King2018-04-193-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d67962c55a SunPro,XL: Add depfile flags to support Ninja generator Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1969
| * | | | | SunPro,XL: Add depfile flags to support Ninja generatorEphi Sinowitz2018-04-173-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add CMAKE_DEPFILE_FLAGS_${lang} to SunPro and XL. These flags are used by the Ninja generator.
* | | | | | Merge topic 'CheckIncludeFile-required-libs'Brad King2018-04-1917-10/+337
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a61ae3fb80 CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES 391a5837ee cmake_policy: Add undocumented PARENT_SCOPE option to GET 3c47ac5b25 OpenWatcom: Add workaround for lack of error on missing library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1978
| * | | | | | CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIESBrad King2018-04-1810-1/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Other check modules honor this variable, so include file checks should too. Add policy `CMP0075` to enable the behavior in a compatible way. This change was originally made by commit v3.11.0-rc1~108^2 (CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES, 2017-12-24) but it was reverted by commit v3.11.1~9^2 (Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES", 2018-04-04) because the behavior change could affect checks in existing projects in an incompatible way. Fixes: #9514
| * | | | | | cmake_policy: Add undocumented PARENT_SCOPE option to GETBrad King2018-04-186-9/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Policies affecting the behavior of CMake-provided macros and functions need to be able to get the policy setting as of the call site rather than the definition site. Add an undocumented option to do this.
| * | | | | | OpenWatcom: Add workaround for lack of error on missing libraryBrad King2018-04-181-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The OpenWatcom tools do not fail to link when a library is missing if no symbols were needed from it. This can break `try_compile` checks. Teach `cmGlobalGenerator::Build` to pretend that the build tool returned non-zero if the output contains the corresponding warning.
* | | | | | | 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
| | | | | | |