summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* CMake Nightly Date StampKitware Robot2017-07-141-1/+1
|
* Merge branch 'release-3.9'Brad King2017-07-130-0/+0
|\
| * Merge branch 'android-system-include-last' into release-3.9Brad King2017-07-137-13/+45
| |\
* | \ Merge topic 'android-system-include-last'Brad King2017-07-137-13/+45
|\ \ \ | | |/ | |/| | | | | | | | | | | | | 4bafa392 Android: Always add standard include directories last Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1052
| * | Android: Always add standard include directories lastBrad King2017-07-137-13/+45
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Merge topic 'win10-sdk-request-mismatch'Brad King2017-07-131-0/+7
|\ \ | | | | | | | | | | | | | | | | | | 80f59ee6 cmGlobalVisualStudio14Generator: notify when the SDK version doesn't match Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !866
| * | cmGlobalVisualStudio14Generator: notify when the SDK version doesn't matchBen Boeckel2017-07-131-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'FindProtobuf-protoc-target'Brad King2017-07-132-4/+18
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | c281acf8 FindProtobuf: add target for protoc Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1045
| * | | FindProtobuf: add target for protocAndré Apitzsch2017-07-122-4/+18
| | | |
* | | | Merge topic 'better-exception-reporting'Brad King2017-07-135-14/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c650f39 CTest: Report more detail about system exceptions in tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1046
| * | | | CTest: Report more detail about system exceptions in testsBill Hoffman2017-07-125-14/+26
| | |/ / | |/| | | | | | | | | | | | | | This passes the system exception string up to CDash and to the command line instead of just printing "other".
* | | | Merge topic 'test_include_files'Brad King2017-07-1312-2/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 117033c1 Add TEST_INCLUDE_DIR[S] unit test ed5bde30 Add TEST_INCLUDE_FILES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1031
| * | | | Add TEST_INCLUDE_DIR[S] unit testMatthew Woehlke2017-07-127-0/+79
| | | | | | | | | | | | | | | | | | | | | | | | | Add a unit test for the TEST_INCLUDE_DIR and (new) TEST_INCLUDE_DIRS directory properties.
| * | | | Add TEST_INCLUDE_FILESMatthew Woehlke2017-07-125-2/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | Merge topic 'labels-for-subprojects'Brad King2017-07-1357-17/+885
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Help: Add notes for topic 'labels_for_subprojects'Betsy McPhail2017-07-101-0/+14
| | | | | |
| * | | | | Add tests for new directory labels and labels-for-subprojects featuresBetsy McPhail2017-07-1032-0/+483
| | | | | |
| * | | | | Display subproject timing summaryBetsy McPhail2017-07-106-1/+102
| | | | | | | | | | | | | | | | | | | | | | | | Use the '--no-subproject-summary' option to disable timing summary.
| * | | | | Add directory property 'LABELS' and CMAKE_DIRECTORY_LABELS variableBetsy McPhail2017-07-1011-14/+194
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The specified LABELS will be passed down to subdirectories as well as any targets or tests in the directory.
| * | | | | Add CTEST_LABELS_FOR_SUBPROJECTS as a CTest module and script variableBetsy McPhail2017-07-1015-2/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use this variable to specify a list of labels that will be reported to CDash as subprojects.
* | | | | | Merge topic 'ninja-dyndep-response-file'Brad King2017-07-131-8/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ef0eedb Ninja: always use response file for cmake_ninja_dyndep Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1038
| * | | | | | Ninja: always use response file for cmake_ninja_dyndepYurii Batrak2017-07-101-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Command line argument passed to the internal tool "cmake_ninja_dyndep" could hit MAX_ARG_STRLEN on Linux for projects with a large code base. To prevent such problems, a response file was opted for argument transfer in all cases, not only on Windows.
* | | | | | | Merge topic 'server-target-backtraces'Brad King2017-07-135-21/+116
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0c572382 server: Report backtraces in codemodel response 4db32275 server: Rename cmServerProtocol1_0 to cmServerProtocol1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !992
| * | | | | | | server: Report backtraces in codemodel responseIvan Shcherbakov2017-07-113-2/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | | server: Rename cmServerProtocol1_0 to cmServerProtocol1Ivan Shcherbakov2017-07-063-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It will serve additional minor versions. Suggested-by: Tobias Hunger <tobias.hunger@qt.io>
* | | | | | | | Merge topic 'source-group-regex-tweaks'Brad King2017-07-132-4/+8
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2c82d9c8 Add more extensions to Resources source group by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1028
| * | | | | | | | Add more extensions to Resources source group by defaultUfoXp2017-07-102-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the Resources group regex to match pdf, png, jpeg, jpg, storyboards, and xcassets. This cleans up more complex Xcode projects a lot. While at it, factor the regular expressions for both "Resources" and "Source Files" into macros.
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-131-1/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'release-3.8'Brad King2017-07-120-0/+0
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'backport-ep-log-no-extract-fix' into release-3.8Brad King2017-07-122-3/+12
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | ExternalProject: only append `COMMAND` if actually adding a commandBen Boeckel2017-07-122-3/+12
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #17046. (cherry picked from commit 99d6de6c1a5871ba03fa008c984cd5408940c3cd)
* | | | | | | | | | Merge branch 'release-3.9'Brad King2017-07-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | CMake 3.9.0-rc6v3.9.0-rc6Brad King2017-07-121-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.9'Brad King2017-07-120-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge branch 'android-fix-c++_shared' into release-3.9Brad King2017-07-121-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'vs-2017-sln-guid' into release-3.9Brad King2017-07-1113-12/+37
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'find_package-root-prefix-path-suffixes' into release-3.9Brad King2017-07-1111-18/+75
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bindexplib-revert-consts' into release-3.9Brad King2017-07-103-22/+12
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge topic 'android-fix-c++_shared'Brad King2017-07-121-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0fb3f31 Android: Link to android_support with c++_shared Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1048
| * | | | | | | | | | | | | Android: Link to android_support with c++_sharedBrad King2017-07-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NDK has done this in `build/core/definitions.mk` since r13 (r12 and below do so only for c++_static).
* | | | | | | | | | | | | | Merge topic 'vs-2017-sln-guid'Brad King2017-07-1213-12/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cf9c3d0 VS: Add SolutionGuid to generated .sln files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1042
| * | | | | | | | | | | | | VS: Add SolutionGuid to generated .sln filesBrad King2017-07-1113-12/+37
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 2017 Update 3 adds a SolutionGuid to its `.sln` files. Fixes: #17041
* | | | | | | | | | | | | Merge topic 'find_package-root-prefix-path-suffixes'Brad King2017-07-1211-18/+75
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | find_*: Honor PATH_SUFFIXES in PackageName_ROOT pathsBrad King2017-07-119-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | | | | cmFindCommon: Drop unused FilterPaths methodBrad King2017-07-112-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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).
| * | | | | | | | | | | | cmFindCommon: Fix typo in PackageName_ROOT path labelBrad King2017-07-111-1/+1
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge topic 'bindexplib-revert-consts'Brad King2017-07-123-22/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3250b9a1 bindexplib: Revert support for constants symbols Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1041
| * | | | | | | | | | | bindexplib: Revert support for constants symbolsBrad King2017-07-103-22/+12
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the main logic change of commit v3.9.0-rc1~192^2 (bindexplib: fix constants symbols export, 2017-04-26) and its test case. Unfortunately some constants may be provided by multiple object files with different `@...` suffixes, leading to ambiguous references. Revert support pending further investigation. Fixes: #17045
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-121-1/+1
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.9'Brad King2017-07-110-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
generated by cgit v0.12 at 2025-09-13 20:00:00 (GMT)