mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-21 06:30:20 -06:00
Code Issues Packages Projects Releases Wiki Activity
35,118 Commits 2 Branches 391 Tags
6a4e189b6814c6b1a103186c611dfe7ecd374fe9
Commit Graph

35118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kitware Robot
6a4e189b68 CMake Nightly Date Stamp 2017-03-11 00:01:04 -05:00
Brad King
0b2438118a Merge topic 'GNU-FindBinUtils-no-policy' 
8fc934de GNU-FindBinUtils: Avoid setting policy CMP0054

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !572
 2017-03-10 11:00:49 -05:00
Brad King
8fc934de0e GNU-FindBinUtils: Avoid setting policy CMP0054 
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.
 2017-03-10 10:46:11 -05:00
Brad King
29ec8d65f2 Merge topic 'pr.gcc_ar' 
b9d36826 Add 'CMAKE_GCC_AR' and 'CMAKE_GCC_RANLIB' variables

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !550
 2017-03-10 08:40:58 -05:00
Brad King
6b586e2c13 Merge topic 'test-CPackComponents-fix-NSIS-root' 
ae0f7dfa Tests: Fix CPackComponents NSIS install root

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !569
 2017-03-10 08:40:38 -05:00
Kitware Robot
7bd58bd67d CMake Nightly Date Stamp 2017-03-10 00:01:04 -05:00
Brad King
21499ee0a3 Merge topic 'x32-abi' 
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
 2017-03-09 11:15:15 -05:00
Brad King
c4f9d10426 Merge topic 'master' 
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
 2017-03-09 11:08:11 -05:00
Brad King
31f3531856 Merge topic 'doc-vs15-MSVC_VERSION' 
66542b66 Help: Update MSVC_VERSION for Visual Studio 2017

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !567
 2017-03-09 10:51:40 -05:00
Brad King
c0e46d42a3 Merge topic 'CheckLanguage-platform-toolset' 
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
 2017-03-09 10:50:52 -05:00
Brad King
ae0f7dfa95 Tests: Fix CPackComponents NSIS install root 
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.
 2017-03-09 10:20:35 -05:00
Kitware Robot
dcbe8ad42b CMake Nightly Date Stamp 2017-03-09 00:01:03 -05:00
Ruslan Baratov
b9d36826c5 Add 'CMAKE_GCC_AR' and 'CMAKE_GCC_RANLIB' variables 2017-03-09 04:28:01 +08:00
Wojciech Mamrak
66542b6636 Help: Update MSVC_VERSION for Visual Studio 2017 
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.
 2017-03-08 14:30:38 -05:00
Steven Newbury
d9bdcf34ef Tests: Add x32 tests to test suite 2017-03-08 17:23:30 +00:00
Brad King
7e8b08ec64 Tests: Pass generator platform and toolset into check for Fortran 
Check for a Fortran compiler that supports the same target platform
as we are testing.
 2017-03-08 09:12:09 -05:00
Brad King
0f5e76df0c CheckLanguage: Pass generator platform and toolset into check 
Otherwise we do not check for support for the language with the same
generator settings as the caller.
 2017-03-08 09:10:45 -05:00
Brad King
0a312e2271 Merge branch 'release' 2017-03-08 08:41:12 -05:00
Brad King
45ca6e739a Merge topic 'fix-static-assert' 
e2f25d3e WriteCompilerDetectionHeader: fix STATIC_ASSERT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !555
 2017-03-08 08:39:12 -05:00
Brad King
c912b72458 Merge topic 'fix_csharp_custom_targets' 
bd8b5401 VS: Do not treat custom targets as CSharp targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !557
 2017-03-08 08:39:01 -05:00
Brad King
83f9c6275d Merge topic 'target-type-ordering-comment' 
322425fa cmStateTypes: document that the ordering of targets is important

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !560
 2017-03-08 08:38:38 -05:00
Brad King
49afdb1e82 Merge topic 'cmake-server-aix' 
f5c4dada cmFileMonitor.h: Include cmConfigure.h first

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !562
 2017-03-08 08:38:20 -05:00
Brad King
87f04b9572 Merge topic 'cuda-test-spelling' 
613b3e49 CUDA: Fix spelling of CudaOnly.SeparateCompilation test targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !563
 2017-03-08 08:38:05 -05:00
Kitware Robot
c87be0c035 CMake Nightly Date Stamp 2017-03-08 00:01:05 -05:00
Brad King
5b6d354f70 Help: Add notes for topic 'x32-abi' 2017-03-07 15:22:55 -05:00
Steven Newbury
bed9c73dec Modules: Add x32-abi support to hard-coded paths 
Update hard-coded library paths in bundled CMake Modules for libx32 as
used with x32-abi.
 2017-03-07 15:22:55 -05:00
Steven Newbury
462cf25427 Add support for x32-abi 
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
 2017-03-07 15:22:55 -05:00
Brad King
613b3e49a0 CUDA: Fix spelling of CudaOnly.SeparateCompilation test targets 2017-03-07 13:26:01 -05:00
Brad King
f5c4dada1b cmFileMonitor.h: Include cmConfigure.h first 
We need this to make Large File Support definitions consistent with
other translation units.
 2017-03-07 11:50:17 -05:00
Brad King
52d39264b4 Merge topic 'doc-dev-testing' 
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
 2017-03-07 11:24:05 -05:00
Brad King
2927e437e0 Help/dev: Document the CMake Testing Process 2017-03-07 11:05:57 -05:00
Brad King
b55e19dd1f Help/dev: Revise README to have a bullet list of available documents 2017-03-07 10:40:56 -05:00
Brad King
ac66dec5c5 Merge branch 'fix_csharp_custom_targets' into release 2017-03-07 09:30:46 -05:00
Michael Stürmer
bd8b5401cf VS: Do not treat custom targets as CSharp targets 
Fixes: #16697
 2017-03-07 09:30:27 -05:00
Ben Boeckel
322425faca cmStateTypes: document that the ordering of targets is important 
The ordering is assumed in many places throughout the code and
modification of the enumeration should be done carefully.
 2017-03-07 09:30:07 -05:00
Brad King
dca58fa279 Merge branch 'release' 2017-03-07 08:27:00 -05:00
Brad King
3bccdd89c8 Merge topic 'revert-CTestTestfile-removal' 
485685fd Revert "Remove CTestTestfile.cmake when BUILD_TESTING is OFF"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !553
 2017-03-07 08:25:02 -05:00
Brad King
e66eec143c Merge topic 'working-directory-fixes' 
aba92ffd cmWorkingDirectory: use the new class
047a5e4d cmWorkingDirectory: add class for changing the workdir
89891bcb cmCTest, cmCTestCoverageHandler: remove cwd dance
c3304fa5 OSXScriptLauncher: remove unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: Brad King <brad.king@kitware.com>
Merge-request: !540
 2017-03-07 08:24:37 -05:00
Brad King
632534104c Merge topic 'cpack_nsis_sign_uninstaller' 
09475c29 CPack/NSIS: Sign the uninstaller

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !512
 2017-03-07 08:24:09 -05:00
Brad King
696c75e991 Merge topic 'autogen_common' 
ef3c319b Autogen: Test: Add mocDepends test
7f9baf57 Autogen: Test: Add generated qrc file to rccDepends test
81656b92 Autogen: Test: Add generated file to moc rerun test
d9a7ef80 Autogen: Test: Add timestamp comparison to moc rerun test
89780663 Autogen: Test: Rename automoc_rerun test to mocRerun
9cad44dc Autogen: Test: Rename autorcc_depends test to rccDepends
60274e1d Autogen: Add RunCommand method with built in logging
8f2ad9c4 Autogen: Error return when a scan file is not readable
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !543
 2017-03-07 08:23:00 -05:00
Brad King
1e1cb41c46 Merge topic 'FindHDF5-lang-include-dirs' 
c6bef559 FindHDF5: set HDF5_<lang>_INCLUDE_DIRS in all cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !548
 2017-03-07 08:22:37 -05:00
Brad King
fda91f4099 Merge topic 'doc-sort-cmake-variables' 
eb44f001 Help: Sort cmake-variables.7 toctree

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !556
 2017-03-07 08:22:03 -05:00
Ruslan Baratov
eb44f00192 Help: Sort cmake-variables.7 toctree 2017-03-07 08:09:01 -05:00
Kitware Robot
51fbaa3099 CMake Nightly Date Stamp 2017-03-07 00:01:03 -05:00
Sebastian Holtermann
ef3c319b97 Autogen: Test: Add mocDepends test 2017-03-06 22:01:04 +01:00
Sebastian Holtermann
7f9baf5790 Autogen: Test: Add generated qrc file to rccDepends test 2017-03-06 22:01:04 +01:00
Sebastian Holtermann
81656b9210 Autogen: Test: Add generated file to moc rerun test 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
d9a7ef80aa Autogen: Test: Add timestamp comparison to moc rerun test 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
89780663b3 Autogen: Test: Rename automoc_rerun test to mocRerun 2017-03-06 22:01:03 +01:00
Sebastian Holtermann
9cad44dce2 Autogen: Test: Rename autorcc_depends test to rccDepends 2017-03-06 22:01:03 +01:00