summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'refactor-module-def'Brad King2017-03-1314-181/+165
|\ | | | | | | | | | | | | | | | | f36eaf6a Refactor WINDOWS_EXPORT_ALL_SYMBOLS implementation 25d261ef Refactor module definition file selection 1e0a9ac4 Refactor module definition source enumeration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !570
| * Refactor WINDOWS_EXPORT_ALL_SYMBOLS implementationBrad King2017-03-0911-137/+90
| | | | | | | | | | | | | | Use `cmGeneratorTarget::ModuleDefinitionInfo` to combine the implementation of `WINDOWS_EXPORT_ALL_SYMBOLS` with that of using a `.def` file as a source. Only one of these could be used within a single target before anyway.
| * Refactor module definition file selectionBrad King2017-03-099-39/+64
| | | | | | | | | | | | Create a `ModuleDefinitionInfo` structure for each configuration of a target to hold corresponding information about the selected module definition file (`.def` source).
| * Refactor module definition source enumerationBrad King2017-03-093-9/+15
| | | | | | | | Add a `cmGeneratorTarget::GetModuleDefinitionSources` method.
* | Merge topic 'update-kwsys'Brad King2017-03-134-3/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | 83be64d9 Merge branch 'upstream-KWSys' into update-kwsys 8ba8b553 KWSys 2017-03-07 (5da8cfe0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !576
| * \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-03-104-3/+22
| |\ \ | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-03-07 (5da8cfe0)
| | * | KWSys 2017-03-07 (5da8cfe0)KWSys Upstream2017-03-104-3/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 5da8cfe0544f95697808b0b46ed3183621902f0b (master). Upstream Shortlog ----------------- Ben Boeckel (1): c5529406 SystemTools: use std::string::empty Robert Maynard (1): 27e64d34 SystemInformation: Teach Is64Bits to check host architecture at runtime
* | | | Merge topic 'FindGit-avoid-vs-2017-git'Brad King2017-03-131-1/+15
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c4d481e5 FindGit: Avoid finding VS 2017 non-general Git installation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !575
| * | | | FindGit: Avoid finding VS 2017 non-general Git installationBrad King2017-03-101-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At a VS 2017 command prompt the `PATH` contains a directory that happens to have a `Git/cmd/git.exe` inside it. However, this executable is not meant for general use. Revise our use of `Git/` path suffixes to be more specific to its original purpose of searching in the typical `c:/Program Files*/Git/` installation directories. Avoid using the suffixes on `PATH` entries. Fixes: #16706
* | | | | CMake Nightly Date StampKitware Robot2017-03-131-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2017-03-121-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2017-03-111-1/+1
| |/ / / |/| | |
* | | | Merge topic 'GNU-FindBinUtils-no-policy'Brad King2017-03-101-3/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8fc934de GNU-FindBinUtils: Avoid setting policy CMP0054 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !572
| * | | | GNU-FindBinUtils: Avoid setting policy CMP0054Brad King2017-03-101-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `cmake_policy(SET)` call triggers `CMP0011` warnings when this module is used in a project that does not set `CMP0011` to NEW. We could avoid these with a `cmake_policy` PUSH/POP pair, but it is simpler to adjust our code to not trigger `CMP0054` in the first place.
* | | | | Merge topic 'pr.gcc_ar'Brad King2017-03-1012-0/+70
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | b9d36826 Add 'CMAKE_GCC_AR' and 'CMAKE_GCC_RANLIB' variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !550
| * | | | Add 'CMAKE_GCC_AR' and 'CMAKE_GCC_RANLIB' variablesRuslan Baratov2017-03-0812-0/+70
| | | | |
* | | | | Merge topic 'test-CPackComponents-fix-NSIS-root'Brad King2017-03-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ae0f7dfa Tests: Fix CPackComponents NSIS install root Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !569
| * | | | | Tests: Fix CPackComponents NSIS install rootBrad King2017-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without `CPACK_VERBATIM_VARIABLES` a path with backslashes does not make it through `CPackConfig.cmake` properly. Just use forward slashes which NSIS seems to understand anyway.
* | | | | | CMake Nightly Date StampKitware Robot2017-03-101-1/+1
| | | | | |
* | | | | | Merge topic 'x32-abi'Brad King2017-03-090-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9bdcf34 Tests: Add x32 tests to test suite 5b6d354f Help: Add notes for topic 'x32-abi' bed9c73d Modules: Add x32-abi support to hard-coded paths 462cf254 Add support for x32-abi Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !532
* \ \ \ \ \ \ Merge topic 'master'Brad King2017-03-0936-16/+128
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d9bdcf34 Tests: Add x32 tests to test suite 5b6d354f Help: Add notes for topic 'x32-abi' bed9c73d Modules: Add x32-abi support to hard-coded paths 462cf254 Add support for x32-abi Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !532
| * | | | | | Tests: Add x32 tests to test suiteSteven Newbury2017-03-0814-5/+36
| | | | | | |
| * | | | | | Help: Add notes for topic 'x32-abi'Brad King2017-03-071-0/+6
| | | | | | |
| * | | | | | Modules: Add x32-abi support to hard-coded pathsSteven Newbury2017-03-078-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update hard-coded library paths in bundled CMake Modules for libx32 as used with x32-abi.
| * | | | | | Add support for x32-abiSteven Newbury2017-03-0713-3/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Detect x32-abi through CMakeCompilerABI infrastruture and use this information at runtime to determine the correct library paths with `FIND_LIBRARY_USE_LIBX32_PATHS`. Fixes: #15994
* | | | | | | Merge topic 'doc-vs15-MSVC_VERSION'Brad King2017-03-091-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 66542b66 Help: Update MSVC_VERSION for Visual Studio 2017 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !567
| * | | | | | | Help: Update MSVC_VERSION for Visual Studio 2017Wojciech Mamrak2017-03-081-1/+2
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value we documented was left from a preview that still used `v140` tools. Update it to match the `v141` tools distributed with the final release.
* | | | | | | Merge topic 'CheckLanguage-platform-toolset'Brad King2017-03-092-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7e8b08ec Tests: Pass generator platform and toolset into check for Fortran 0f5e76df CheckLanguage: Pass generator platform and toolset into check Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !565
| * | | | | | | Tests: Pass generator platform and toolset into check for FortranBrad King2017-03-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for a Fortran compiler that supports the same target platform as we are testing.
| * | | | | | | CheckLanguage: Pass generator platform and toolset into checkBrad King2017-03-081-0/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise we do not check for support for the language with the same generator settings as the caller.
* | | | | | | CMake Nightly Date StampKitware Robot2017-03-091-1/+1
|/ / / / / /
* | | | | | Merge branch 'release'Brad King2017-03-080-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix_csharp_custom_targets' into releaseBrad King2017-03-071-0/+4
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'fix-static-assert'Brad King2017-03-083-4/+19
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e2f25d3e WriteCompilerDetectionHeader: fix STATIC_ASSERT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !555
| * | | | | | | | WriteCompilerDetectionHeader: fix STATIC_ASSERTDaniel Pfeifer2017-03-063-4/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes #16185
* | | | | | | | | Merge topic 'fix_csharp_custom_targets'Brad King2017-03-081-0/+4
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bd8b5401 VS: Do not treat custom targets as CSharp targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !557
| * | | | | | | | VS: Do not treat custom targets as CSharp targetsMichael Stürmer2017-03-071-0/+4
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Fixes: #16697
* | | | | | | | Merge topic 'target-type-ordering-comment'Brad King2017-03-081-0/+3
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 322425fa cmStateTypes: document that the ordering of targets is important Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !560
| * | | | | | | | cmStateTypes: document that the ordering of targets is importantBen Boeckel2017-03-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ordering is assumed in many places throughout the code and modification of the enumeration should be done carefully.
* | | | | | | | | Merge topic 'cmake-server-aix'Brad King2017-03-081-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5c4dada cmFileMonitor.h: Include cmConfigure.h first Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !562
| * | | | | | | | | cmFileMonitor.h: Include cmConfigure.h firstBrad King2017-03-071-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need this to make Large File Support definitions consistent with other translation units.
* | | | | | | | | | Merge topic 'cuda-test-spelling'Brad King2017-03-081-8/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 613b3e49 CUDA: Fix spelling of CudaOnly.SeparateCompilation test targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !563
| * | | | | | | | | | CUDA: Fix spelling of CudaOnly.SeparateCompilation test targetsBrad King2017-03-071-8/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-03-081-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge topic 'doc-dev-testing'Brad King2017-03-073-10/+58
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2927e437 Help/dev: Document the CMake Testing Process b55e19dd Help/dev: Revise README to have a bullet list of available documents Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !561
| * | | | | | | | Help/dev: Document the CMake Testing ProcessBrad King2017-03-073-8/+54
| | | | | | | | |
| * | | | | | | | Help/dev: Revise README to have a bullet list of available documentsBrad King2017-03-071-2/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge branch 'release'Brad King2017-03-070-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'revert-CTestTestfile-removal' into releaseBrad King2017-03-061-7/+4
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'FindVulkan-fix-win-32' into releaseBrad King2017-03-061-0/+1
| |\ \ \ \ \ \ \ \