Commit Graph

32650 Commits

Author SHA1 Message Date
Brad King d1ee1cb813 Merge topic 'test-RunCMake.CMP0040-fix'
828e7632 Tests: Fix RunCMake.CMP0040 custom command syntax
2016-08-25 09:50:23 -04:00
Brad King d8b70f62cb Merge topic 'update-kwsys'
7bc6dccc Merge branch 'upstream-KWSys' into update-kwsys
fcc53247 KWSys 2016-08-24 (8e643b9b)
2016-08-25 09:50:19 -04:00
Stephen Kelly 1462576bcb Parser: Port away from cmMakefile
It is an unneeded dependency.
2016-08-25 09:47:27 -04:00
Stephen Kelly 421012a330 cmMessenger: Extract from cmake class
This way messages can be issued independent of the cmake instance.

It is now possible to make DisplayMessage a virtual interface and
override it to handle messages in the cmake-gui or future IDE
interaction interfaces.
2016-08-25 09:47:27 -04:00
Stephen Kelly 14a8d61fd4 cmMakefile: Port nested error logic away from cmExecutionStatus
It is no longer needed.
2016-08-25 09:47:26 -04:00
Stephen Kelly 2af853deb5 cmMakefile: Simplify IssueMessage implementation
It is only called during configure time when the execution stack is
non-empty.
2016-08-25 09:47:26 -04:00
Stephen Kelly 33bb9cfa36 Parser: Issue messages through cmake, not cmSystemTools
Make these messages uniform with regard to other messages issued by
cmake.
2016-08-25 09:47:26 -04:00
Daniel Pfeifer 3849164454 CTest: fix include-what-you-use violations 2016-08-25 09:34:37 -04:00
Brad King f325ae186d VS: Use target-specific directory for `resources.pri`
Set the `ProjectPriFullPath` field to a value that is unique to each
target and not shared with others in order to avoid collisions.

Closes: #16106
2016-08-25 09:17:17 -04:00
Kitware Robot d6734eeb87 CMake Nightly Date Stamp 2016-08-25 00:01:04 -04:00
Brad King 81c3e637cc Merge topic 'update-third-party-git-2.9'
dcb2e39f update-third-party: support Git 2.9.0's new merge restrictions
2016-08-24 14:23:56 -04:00
Ben Boeckel dcb2e39fda update-third-party: support Git 2.9.0's new merge restrictions
Use the `--allow-unrelated-histories` flag to declare that we Know What
We're Doing™ (but only if necessary).
2016-08-24 14:16:13 -04:00
Stephen Kelly db7de303c2 Parser: Store the Backtrace for use in issuing messages 2016-08-24 19:19:37 +02:00
Brad King 86f1d70445 Merge branch 'release' 2016-08-24 11:59:42 -04:00
Brad King 83fd4a7039 Merge branch 'intel-fortran-mod-diff' into release 2016-08-24 11:58:58 -04:00
Brad King f699323ade Fortran: Fix .mod file comparison for Intel 16 format
The Intel 16 format starts with the 0x0A 0x00 sequence that we use to
skip past the timestamp.  This occurrence appears to be a version
number.  Skip the first byte to avoid matching the sequence early.

Ideally we should gain a better understanding of the format and avoid
depending on short sequences that are likely to appear early by
coincidence, but this approach will suffice for now.

Closes: #16263
2016-08-24 11:55:29 -04:00
Brad King 828e763260 Tests: Fix RunCMake.CMP0040 custom command syntax 2016-08-24 10:56:57 -04:00
Brad King 7bc6dccc0a Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2016-08-24 (8e643b9b)
2016-08-24 10:55:19 -04:00
KWSys Upstream fcc532470a KWSys 2016-08-24 (8e643b9b)
Code extracted from:

    http://public.kitware.com/KWSys.git

at commit 8e643b9b5f24d4cac68d59b1e2be9d161fb75974 (master).

Upstream Shortlog
-----------------

Brad King (1):
      8e643b9b SystemTools: Fix crash in GetShortPath
2016-08-24 10:55:18 -04:00
Brad King 96de37092a Merge topic 'android-platform-modules'
7b637ebd Android: Add `ANDROID` variable to indicate the target
c2f561e5 Android: Add test cases covering use of the NDK and standalone toolchains
6b84df8d Help: Document cross compiling for Android
d7d40830 Android: Select the STL type for NDK builds
b22294bc Android: Populate compiler flags for current ABI
b6a3102a Android: Add a CMAKE_BUILD_TYPE default
d1e3cec2 Android: Add Clang -target option for current ABI
504db72d Android: Add placeholders for compiler/abi-specific settings
fa632578 Android: Avoid interfering with common pre-existing toolchain files
6299693f Android: Search for NDK and standalone toolchain in more places
29b51379 Android: Detect and save a standalone toolchain without the NDK
7d9b49fb Android: Detect settings from the CMAKE_SYSROOT if it is set
4389664a Android: Detect and save a toolchain from the NDK
328191f6 Android: Set CMAKE_SYSROOT automatically
9e032304 Android: Detect and save the architecture, ABI, and processor
fde59c4d Android: Detect and save the API level
...
2016-08-24 09:45:50 -04:00
Brad King ccddb454b8 Merge topic 'extend-find-package-search-path'
828d6c13 find_package: Extend search path for combined Windows/UNIX convention
ff5c89de Help: Widen find_package search path table
2016-08-24 09:45:47 -04:00
Brad King 4a2a66e31c Merge topic 'include-what-you-use'
5cbb5488 fix a batch of include-what-you-use violations
2016-08-24 09:45:44 -04:00
Brad King 21a7809bfa Merge topic 'doc-get_cmake_property'
15cc50fb Help: Clarify get_cmake_property command documentation
2016-08-24 09:45:41 -04:00
Brad King 5c8b69b0f5 Merge topic 'FindCUDA-fix-arch-regex'
2dc9a754 FindCUDA: Support `2.1(2.0)` architecture notation
2016-08-24 09:45:39 -04:00
Brad King 1d858dc017 Merge topic 'test-extra-generator-dedup'
9bd0643a Tests: Refactor testing of extra generators.
2016-08-24 09:45:36 -04:00
Brad King 2986ca5ecc Merge topic 'version-cleanups'
aec06dd4 Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1
ef13efab Version: Remove check for existence of CVS repository
2016-08-24 09:45:33 -04:00
Brad King a71ca1f0b3 Merge topic 'import-vim-syntax'
b4556b47 Help: Add release notes for 'vim-cmake-syntax' import
25c01cf0 Aux: Install vim-cmake-syntax files with CMake
e3ac68cf Merge branch 'upstream-vim-cmake-syntax' into import-vim-syntax
4a22c06e vim-cmake-syntax 2016-08-16 (e782679c)
f21a8235 Aux: Drop vim files prior to import of third-party version
0966f1c5 Add script to update vim-cmake-syntax from upstream
2016-08-24 09:45:29 -04:00
Silvio Traversaro 828d6c137d find_package: Extend search path for combined Windows/UNIX convention
Find packages that install their cmake package configuration files in
`lib/cmake/<name>` when they are installed in the default Windows
CMAKE_INSTALL_PREFIX, `C:/Program Files/<name>`.

Closes: #16212
2016-08-24 09:40:25 -04:00
Kitware Robot 00a583ac68 CMake Nightly Date Stamp 2016-08-24 00:01:04 -04:00
Daniel Pfeifer 5cbb548807 fix a batch of include-what-you-use violations 2016-08-24 00:29:15 +02:00
Silvio Traversaro ff5c89de0c Help: Widen find_package search path table
Make room for additional longer entries.
2016-08-23 13:28:42 -04:00
Brad King 7b637ebdc9 Android: Add `ANDROID` variable to indicate the target
Allow projects to use `if(ANDROID)` to condition their Android-specific
code paths.
2016-08-23 13:10:51 -04:00
Brad King c2f561e58c Android: Add test cases covering use of the NDK and standalone toolchains 2016-08-23 12:53:10 -04:00
Brad King 6b84df8da9 Help: Document cross compiling for Android
CMake now supports cross compiling for Android using the NDK or a
standalone toolchain.  Document the associated variables and how how to
write toolchain files for Android.
2016-08-23 12:53:10 -04:00
Brad King d7d4083025 Android: Select the STL type for NDK builds
Populate standard include directories and link libraries for the
platform.  Select the STL corresponding to CMAKE_ANDROID_STL_TYPE and
matching the current ABI and toolchain to be used.  Refer to the NDK
sources/cxx-stl/*/Android.mk files for the needed file locations.
2016-08-23 12:53:10 -04:00
Brad King b22294bc41 Android: Populate compiler flags for current ABI
Initialize the CMAKE_{C,CXX}_FLAGS{,_<CONFIG>} cache entries with
flags for each ABI as specified by NDK toolchain `setup.mk` files.
2016-08-23 12:51:58 -04:00
Brad King 15cc50fbb5 Help: Clarify get_cmake_property command documentation
Closes: #13810, #16258
2016-08-23 11:14:09 -04:00
Boris Fomitchev 2dc9a754b5 FindCUDA: Support `2.1(2.0)` architecture notation
Also tweak some messages and comments.
2016-08-23 10:47:27 -04:00
Chaoren Lin 9bd0643a77 Tests: Refactor testing of extra generators.
Use a loop instead of repeating the same thing multiple times.
2016-08-23 10:37:38 -04:00
Brad King aec06dd492 Version: Always define CMake_VERSION_IS_DIRTY to 0 or 1
In cmVersionConfig.h we must define this macro with a value because
clients expect it to have one.  Also ensure that all CMakeLists.txt
code paths have an initialized value.

Reported-by: Stephen Kelly <steveire@gmail.com>
2016-08-23 09:11:57 -04:00
Stephen Kelly ef13efab56 Version: Remove check for existence of CVS repository 2016-08-23 09:11:57 -04:00
Brad King 797f7ad87d Merge topic 'else-after-return'
7b6349da CMake: don't use else after return
50ad1e0a CTest: don't use else after return
7f97a6c9 CPack: don't use else after return
4988b914 CursesDialog: don't use else after return
2016-08-23 09:00:00 -04:00
Brad King 762131fe8d Merge topic 'include-what-you-use'
f29d1847 fix a batch of include-what-you-use violations
373b2e48 cmArchiveWrite: replace mode_t with int
2016-08-23 08:59:57 -04:00
Brad King d15a502f8e Merge topic 'minor-cleanups'
27591a54 Define WIN32_LEAN_AND_MEAN for CMake sources on Windows
481c9003 libarchive: Fix include order in xxhash.c
2016-08-23 08:59:54 -04:00
Daniel Pfeifer f29d184773 fix a batch of include-what-you-use violations 2016-08-23 08:56:59 -04:00
Kitware Robot 68b51a57e5 CMake Nightly Date Stamp 2016-08-23 00:01:05 -04:00
Kitware Robot 74ee03a262 CMake Nightly Date Stamp 2016-08-22 00:01:03 -04:00
Kitware Robot 020c3e409d CMake Nightly Date Stamp 2016-08-21 00:01:04 -04:00
Kitware Robot 8142698e7a CMake Nightly Date Stamp 2016-08-20 00:01:03 -04:00
Kitware Robot 03d0e6b9bb CMake Nightly Date Stamp 2016-08-19 00:01:05 -04:00