CMake merge requestshttps://gitlab.kitware.com/cmake/cmake/-/merge_requests2017-01-12T10:25:58-05:00https://gitlab.kitware.com/cmake/cmake/-/merge_requests/388Don't try watching empty subdirectories2017-01-12T10:25:58-05:00AleixDon't try watching empty subdirectoriescmsys::SystemTools::SplitPath will return empty segments on paths where
there's duplicaded consequent slashes (e.g. /home/dir/my//stuff). This
makes the cmFileWatcher choke.
This patch modifies the cmFileMonitor so that it will skip thes...cmsys::SystemTools::SplitPath will return empty segments on paths where
there's duplicaded consequent slashes (e.g. /home/dir/my//stuff). This
makes the cmFileWatcher choke.
This patch modifies the cmFileMonitor so that it will skip these empty
segments.
Solves CMake issue #165313.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/375server-mode: Do not crash when running into INTERFACE_LIBRARY2017-01-10T09:35:13-05:00Tobias Hungerserver-mode: Do not crash when running into INTERFACE_LIBRARYPlease consider this for the release branch!
This is a bit ugly, but I did not want to get into major surgery to properly support `INTERFACE_LIBRARY` in the release branch.
Ideally there would be a way to report the include directo...Please consider this for the release branch!
This is a bit ugly, but I did not want to get into major surgery to properly support `INTERFACE_LIBRARY` in the release branch.
Ideally there would be a way to report the include directories/defines that are *exported* by this kind of target, so that I can scan for the include files that are part of this.
On the other hand: Maybe this is not really necessary since the targets linking against interface libraries do report the include paths that they got from the interface library.
Closes: #16539
3.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/365FindPostgreSQL: automatically find installations from yum.postgresql.org2017-01-11T10:05:17-05:00Rolf Eike BeerFindPostgreSQL: automatically find installations from yum.postgresql.orgIn commit d4fd30d8d8f5b9c4b5a110b4676cad2a19d7c314 (FindPostgreSQL: Search some more common packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was removed. This was used e.g. by osm2pgsql to be able to build on CentOS w...In commit d4fd30d8d8f5b9c4b5a110b4676cad2a19d7c314 (FindPostgreSQL: Search some more common packaging locations) the PostgreSQL_ADDITIONAL_SEARCH_PATHS variable was removed. This was used e.g. by osm2pgsql to be able to build on CentOS with recent PostgreSQL versions. At least add those locations from yum.postgresql.org, which is a more or less official location.
The variable can be replaced downstream with CMAKE_PREFIX_PATH, which will work both with newer and older versions of CMake, so I do not see a need to reintroduce them.3.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/361FindBoost: Add support for 1.632017-01-11T10:05:18-05:00Roger LeighFindBoost: Add support for 1.63- Added 1.63.0 and 1.63 as supported versions
- Added the component dependencies for 1.63 (unchanged from 1.62)- Added 1.63.0 and 1.63 as supported versions
- Added the component dependencies for 1.63 (unchanged from 1.62)3.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/336Server-mode: Call ResetErrorOccured before configure2017-01-09T16:28:16-05:00Tobias HungerServer-mode: Call ResetErrorOccured before configureCloses #16506.
This sits on top of the release branch as I think this is a low-risk fix.Closes #16506.
This sits on top of the release branch as I think this is a low-risk fix.3.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/316VS: Fix standalone Windows7.1SDK toolset selection2016-12-08T08:55:41-05:00Brad KingVS: Fix standalone Windows7.1SDK toolset selectionSince commit 059c230d89b2f5c82423fc6458302620f4b09599 we prefer to always set a platform toolset explicitly so that `CMAKE_VS_PLATFORM_TOOLSET` can be reported. However, the `v100` default for the VS 10 generator is not appropriate for ...Since commit 059c230d89b2f5c82423fc6458302620f4b09599 we prefer to always set a platform toolset explicitly so that `CMAKE_VS_PLATFORM_TOOLSET` can be reported. However, the `v100` default for the VS 10 generator is not appropriate for all environments. We fixed support for VS 2010 Express Edition in commit 861f1b3da65d3eda55e0e1f29d628aa3fb643f70.
Fix support for the standalone Windows7.1SDK toolset environment by recognizing the `PlatformToolset` environment variable that it sets to `Windows7.1SDK` and using this as our default toolset instead.
Closes: #164833.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/314FindBoost: Fix MSVC2017 compatibility2016-12-09T14:25:18-05:00Zheng LuoFindBoost: Fix MSVC2017 compatibilityMSVC2017 was released days ago, and `FindBoost` still cannot detect MSVC2017 correctly.
> -- The C compiler identification is MSVC 19.10.24629.0
>
> -- The CXX compiler identification is MSVC 19.10.24629.0MSVC2017 was released days ago, and `FindBoost` still cannot detect MSVC2017 correctly.
> -- The C compiler identification is MSVC 19.10.24629.0
>
> -- The CXX compiler identification is MSVC 19.10.24629.03.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/298VS: Add v140 and v141 flag table entries for `-Zc:inline[-]`2016-12-01T08:52:59-05:00Brad KingVS: Add v140 and v141 flag table entries for `-Zc:inline[-]`The [documentation of this option](https://msdn.microsoft.com/en-us/library/dn642448.aspx) claims that the default is off, but VS seems to use `-Zc:inline` by default if `RemoveUnreferencedCodeData` does not appear in the `.vcxproj` file...The [documentation of this option](https://msdn.microsoft.com/en-us/library/dn642448.aspx) claims that the default is off, but VS seems to use `-Zc:inline` by default if `RemoveUnreferencedCodeData` does not appear in the `.vcxproj` file. Add the flag table entry to allow use of the flag to be configured.
Suggested on mailing list thread Nov 2016: [VS2015 /Zc:inline](https://cmake.org/pipermail/cmake-developers/2016-November/029659.html).3.7.2Brad KingBrad Kinghttps://gitlab.kitware.com/cmake/cmake/-/merge_requests/297server-mode: Do not ignore the first cacheArgument on configure2016-12-01T08:53:00-05:00Tobias Hungerserver-mode: Do not ignore the first cacheArgument on configureSetCacheArgs skips the first argument it gets, so add some padding before calling it.
Please consider this for 3.7.1.SetCacheArgs skips the first argument it gets, so add some padding before calling it.
Please consider this for 3.7.1.3.7.2Brad KingBrad King