summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'vs-2017-choose-via-environment' into release-3.9Brad King2017-07-102-0/+40
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'autogen_skip_included' into release-3.9Brad King2017-07-101-28/+33
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'FindMFC-try-static'Brad King2017-07-112-0/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6b2bf575 FindMFC: Check for static MFC variant Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1034
| * | | | | | | | FindMFC: Check for static MFC variantRich Chiodo2017-07-062-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some CMake applications can set /MT without setting CMAKE_MFC_FLAG. This change lets FindMFC work in those situations.
* | | | | | | | | Merge topic 'file-LOCK-windows-message'Brad King2017-07-111-12/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | efaf987a cmFileLockResult: Avoid allocation for Windows error message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1035
| * | | | | | | | | cmFileLockResult: Avoid allocation for Windows error messageIyyappa Murugandi2017-07-071-12/+7
| |/ / / / / / / /
* | | | | | | | | Merge topic 'vs-2017-choose-via-environment'Brad King2017-07-112-0/+40
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2644e4c9 VS: Choose VS 2017 instance via environment variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1030
| * | | | | | | | VS: Choose VS 2017 instance via environment variableBrad King2017-07-102-0/+40
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the `Visual Studio 15 2017` generator, if the `VS150COMNTOOLS` environment variable points at a specific VS 2017 instance reported by the Visual Studio Installer tool, use that as the preferred instance. Inspired-by: Iyyappa Murugandi <iyyappam@microsoft.com> Fixes: #16846
* | | | | | | | Merge topic 'autogen_skip_included'Brad King2017-07-111-28/+33
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecac50e1 Autogen: Skip included files on demand Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1039
| * | | | | | | Autogen: Skip included files on demandSebastian Holtermann2017-07-101-28/+33
| | | | | | | |
* | | | | | | | Merge topic 'doc_configure_file'Brad King2017-07-112-2/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c7d81e16 Help: Explicitly state that some file generations are lazy Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1025
| * | | | | | | | Help: Explicitly state that some file generations are lazySylvain Joubert2017-07-072-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #16856
* | | | | | | | | Merge topic 'FindPkgConfig-rerun'Brad King2017-07-111-1/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3cf267cf FindPkgConfig: do not always rerun pkg_check_modules() with 2 arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1036
| * | | | | | | | | FindPkgConfig: do not always rerun pkg_check_modules() with 2 argumentsRolf Eike Beer2017-07-101-1/+3
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~47^2 (FindPkgConfig: Recheck pkg-config on parameter change, 2017-01-17) calling `pkg_check_modules` always re-runs. The problem is that if there are only 2 arguments passed to `pkg_check_modules```, then `_module0` will be set and `ARGN` will be empty. When this is written to cache it will be stored as just the value of `_module0` without any semicolon, so on the next run this doesn't match the expected value and the search is rerun. Revise the logic to handle the case of empty `ARGN` separately. Fixes: #17003
* | | | | | | | | Merge topic 'FindHDF5-windows'Brad King2017-07-111-15/+27
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | FindHDF5: Define H5_BUILT_AS_DYNAMIC_LIB when using Windows DLLsKris Thielemans2017-07-071-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When searching for shared libraries on Windows, add H5_BUILT_AS_DYNAMIC_LIB to HDF5_DEFINITIONS so that the header file knows how to dllimport the symbols.
| * | | | | | | | | FindHDF5: Add support for HDF5_USE_STATIC_LIBRARIES on WindowsKris Thielemans2017-07-071-15/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also add the `_D` suffix for debug libraries.
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-07-111-1/+1
| | | | | | | | | |
* | | | | | | | | | Merge branch 'release-3.9'Brad King2017-07-100-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'autogen-no-generated-files' into release-3.9Brad King2017-07-073-0/+10
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'find_package-restore-considered-configs' into release-3.9Brad King2017-07-0712-2/+47
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'autogen-no-generated-files'Brad King2017-07-103-0/+10
|\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9a34e95a Autogen: Skip generated files for compatibility with CMake 3.8 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1033
generated by cgit v0.12 at 2025-02-03 07:57:31 (GMT)