mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-22 22:31:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
36,637 Commits 2 Branches 401 Tags
336c4fc6fa80149e189a19f91b8de934b48105de
Commit Graph

36637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Boeckel 336c4fc6fa CMakeDetermineASMCompiler: fix a CMP0054 warning 
This was introduced in commit d8e6cd9e (IAR: Improve support for IAR ARM
Compiler, 2017-06-15) from !991.

Fixes #17062.
 2017-07-13 14:01:38 -04:00
Brad King 4b460a5ba8 Merge branch 'release-3.9' 2017-07-13 10:08:27 -04:00
Brad King 489a7706c2 Merge topic 'android-system-include-last' 
4bafa392 Android: Always add standard include directories last

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1052
 2017-07-13 10:07:36 -04:00
Brad King d11c48e0e3 Merge branch 'android-system-include-last' into release-3.9 2017-07-13 10:04:14 -04:00
Brad King 4bafa3922e Android: Always add standard include directories last 
The logic added in commit v3.6.0-rc1~30^2 (Add a variable to specify
language-wide system include directories, 2016-05-24) to use
`CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES` incorrectly filters them by
`CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`.  Rather than recognizing
this, commit v3.8.0-rc1~60^2 (Android: Pass sysroot include directory
explicitly, 2017-01-20) worked around the problem by incorrectly
removing `/usr/include` from `CMAKE_<LANG>_IMPLICIT_INCLUDE_DIRECTORIES`
so it worked in `CMAKE_<LANG>_STANDARD_INCLUDE_DIRECTORIES`.

By not filtering out `/usr/include` from user-specified include
directories, we allow the code

    include_directories(${CMAKE_SYSROOT}/usr/include)

to place the include directory too early on the command line.

Fix support for standard include directories to not be filtered by
implicit include directories, and do not remove `/usr/include` from the
list of implicit include directories for Android builds.  Add a test
case to verify that an explicit `/usr/include` is ignored in favor
of the standard directory at the end.

Fixes: #17059
 2017-07-13 10:03:58 -04:00
Brad King aa97170f2b Merge topic 'win10-sdk-request-mismatch' 
80f59ee6 cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !866
 2017-07-13 08:23:56 -04:00
Ben Boeckel 80f59ee602 cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match 
When requesting an SDK version which is not suitable (e.g., missing
`windows.h`), CMake will use the next-best SDK version. Output a message
when CMake chooses something different than the requested SDK version.

See #16895.
 2017-07-13 08:10:57 -04:00
Brad King a4a39a46c3 Merge topic 'FindProtobuf-protoc-target' 
c281acf8 FindProtobuf: add target for protoc

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1045
 2017-07-13 07:52:09 -04:00
Brad King 47d9772618 Merge topic 'better-exception-reporting' 
0c650f39 CTest: Report more detail about system exceptions in tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1046
 2017-07-13 07:51:05 -04:00
Brad King 0f158272d6 Merge topic 'test_include_files' 
117033c1 Add TEST_INCLUDE_DIR[S] unit test
ed5bde30 Add TEST_INCLUDE_FILES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1031
 2017-07-13 07:46:47 -04:00
Brad King f5be951117 Merge topic 'labels-for-subprojects' 
376dc3eb Help: Add notes for topic 'labels_for_subprojects'
a70d8e93 Add tests for new directory labels and labels-for-subprojects features
47b3a57c Display subproject timing summary
d3859624 Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variable
d08ec4d2 Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1004
 2017-07-13 07:46:09 -04:00
Brad King 37915a6930 Merge topic 'ninja-dyndep-response-file' 
4ef0eedb Ninja: always use response file for cmake_ninja_dyndep

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1038
 2017-07-13 07:45:11 -04:00
Brad King e5c762d32d Merge topic 'server-target-backtraces' 
0c572382 server: Report backtraces in codemodel response
4db32275 server: Rename cmServerProtocol1_0 to cmServerProtocol1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !992
 2017-07-13 07:44:11 -04:00
Brad King c8f4cf0821 Merge topic 'source-group-regex-tweaks' 
2c82d9c8 Add more extensions to Resources source group by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1028
 2017-07-13 07:42:42 -04:00
Kitware Robot 3d209acc1f CMake Nightly Date Stamp 2017-07-13 00:01:06 -04:00
André Apitzsch c281acf807 FindProtobuf: add target for protoc 2017-07-12 13:48:22 -04:00
Brad King 75cbc5611d Merge branch 'release-3.8' 2017-07-12 13:38:02 -04:00
Brad King 23fb573c5f Merge branch 'backport-ep-log-no-extract-fix' into release-3.8 2017-07-12 13:37:54 -04:00
Bill Hoffman 0c650f3965 CTest: Report more detail about system exceptions in tests 
This passes the system exception string up to CDash and to the command line
instead of just printing "other".
 2017-07-12 13:29:21 -04:00
Matthew Woehlke 117033c1d9 Add TEST_INCLUDE_DIR[S] unit test 
Add a unit test for the TEST_INCLUDE_DIR and (new) TEST_INCLUDE_DIRS
directory properties.
 2017-07-12 13:28:21 -04:00
Matthew Woehlke ed5bde30f7 Add TEST_INCLUDE_FILES 
Add new directory property TEST_INCLUDE_FILES. This supersedes
TEST_INCLUDE_FILE, though the latter is of course retained for
compatibility.

Basically, this is a list rather than a single file. This allows the
feature to be used by generic utilities without conflicting with local
use.
 2017-07-12 13:28:21 -04:00
Ben Boeckel 627422d9de ExternalProject: only append COMMAND if actually adding a command 
Fixes #17046.

(cherry picked from commit 99d6de6c1a)
 2017-07-12 11:33:07 -04:00
Brad King ca7f6c3451 Merge branch 'release-3.9' 2017-07-12 10:27:25 -04:00
Brad King 25b72e9097 CMake 3.9.0-rc6 v3.9.0-rc6 2017-07-12 09:20:01 -04:00
Brad King 5b67090d9f Merge branch 'release-3.9' 2017-07-12 09:19:25 -04:00
Brad King e63472abc5 Merge topic 'android-fix-c++_shared' 
e0fb3f31 Android: Link to android_support with c++_shared

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1048
 2017-07-12 09:00:43 -04:00
Brad King ff9321a18a Merge topic 'vs-2017-sln-guid' 
5cf9c3d0 VS: Add SolutionGuid to generated .sln files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1042
 2017-07-12 08:59:26 -04:00
Brad King 083a5cad0e Merge topic 'find_package-root-prefix-path-suffixes' 
80b905f8 find_*: Honor PATH_SUFFIXES in PackageName_ROOT paths
1ae1b880 cmFindCommon: Drop unused FilterPaths method
cca8454e cmFindCommon: Fix typo in PackageName_ROOT path label

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Chuck Atkins <chuck.atkins@kitware.com>
Merge-request: !1044
 2017-07-12 08:59:07 -04:00
Brad King 7020833841 Merge topic 'bindexplib-revert-consts' 
3250b9a1 bindexplib: Revert support for constants symbols

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1041
 2017-07-12 08:58:36 -04:00
Brad King e8e38aea26 Merge branch 'android-fix-c++_shared' into release-3.9 2017-07-12 08:39:55 -04:00
Brad King e0fb3f314f Android: Link to android_support with c++_shared 
The NDK has done this in `build/core/definitions.mk` since r13
(r12 and below do so only for c++_static).
 2017-07-12 08:39:42 -04:00
Kitware Robot fadcfd4b89 CMake Nightly Date Stamp 2017-07-12 00:01:06 -04:00
Brad King c42c039d32 Merge branch 'vs-2017-sln-guid' into release-3.9 2017-07-11 10:42:21 -04:00
Brad King 5cf9c3d0cc VS: Add SolutionGuid to generated .sln files 
Visual Studio 2017 Update 3 adds a SolutionGuid to its `.sln` files.

Fixes: #17041
 2017-07-11 10:41:28 -04:00
Brad King 7638c6ea8d Merge branch 'find_package-root-prefix-path-suffixes' into release-3.9 2017-07-11 09:20:37 -04:00
Brad King 80b905f882 find_*: Honor PATH_SUFFIXES in PackageName_ROOT paths 
This was accidentally forgotten in commit v3.9.0-rc1~71^2~2 (find_*: Add
a new PackageRoot search path group, 2017-05-03).

Fixes: #17052
 2017-07-11 09:11:19 -04:00
Brad King 1ae1b880a8 cmFindCommon: Drop unused FilterPaths method 
The method has not been used since commit v3.2.0-rc1~400^2~1
(Encapsulate search path manipulation functions into a seperate class,
2014-10-15).
 2017-07-11 09:11:19 -04:00
Brad King cca8454ee5 cmFindCommon: Fix typo in PackageName_ROOT path label 2017-07-11 09:11:19 -04:00
Ivan Shcherbakov 0c57238215 server: Report backtraces in codemodel response 
Report the source locations (e.g. in `CMakeLists.txt`) for all targets
and target-related statements.  This allows IDEs to locate the
statements and automatically edit them when the user adds or removes
files or changes target properties via GUI.

Increment the protocol minor version number to tell clients that the new
information is available.
 2017-07-11 07:50:22 -04:00
Brad King 107a92ea9a Merge branch 'release-3.9' 2017-07-11 07:42:09 -04:00
Brad King 79e72f4b7c Merge topic 'FindMFC-try-static' 
6b2bf575 FindMFC: Check for static MFC variant

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1034
 2017-07-11 07:39:15 -04:00
Brad King de72d5dda6 Merge topic 'file-LOCK-windows-message' 
efaf987a cmFileLockResult: Avoid allocation for Windows error message

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1035
 2017-07-11 07:38:54 -04:00
Brad King 970569a941 Merge topic 'vs-2017-choose-via-environment' 
2644e4c9 VS: Choose VS 2017 instance via environment variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1030
 2017-07-11 07:37:42 -04:00
Brad King a49b235db9 Merge topic 'autogen_skip_included' 
ecac50e1 Autogen: Skip included files on demand

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1039
 2017-07-11 07:35:56 -04:00
Brad King 59e52b3041 Merge topic 'doc_configure_file' 
c7d81e16 Help: Explicitly state that some file generations are lazy

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1025
 2017-07-11 07:35:27 -04:00
Brad King 8d5ec21928 Merge topic 'FindPkgConfig-rerun' 
3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1036
 2017-07-11 07:34:58 -04:00
Brad King 8f63f3495d Merge topic 'FindHDF5-windows' 
6848ff4c FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLs
6f131f49 FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1023
 2017-07-11 07:34:23 -04:00
Kitware Robot e1476f9618 CMake Nightly Date Stamp 2017-07-11 00:01:08 -04:00
Betsy McPhail 376dc3eb22 Help: Add notes for topic 'labels_for_subprojects' 2017-07-10 16:25:19 -04:00
Betsy McPhail a70d8e93e8 Add tests for new directory labels and labels-for-subprojects features 2017-07-10 16:25:19 -04:00