diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-04-14 22:08:50 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 22:08:50 -0700 |
| commit | 22623e35016cae6061e0d9e502577077b3c33fd9 (patch) | |
| tree | 0a8cc4e43fd871bacb3010e9ff06b21dba4e800d /toolsrc/include | |
| parent | 1e19af09e53e5f306ed89c2033817a21e5ee0bcf (diff) | |
| download | vcpkg-22623e35016cae6061e0d9e502577077b3c33fd9.tar.gz vcpkg-22623e35016cae6061e0d9e502577077b3c33fd9.zip | |
[vcpkg] Clean up CMake build system (#10834)
There are quite a few changes to the CMake build system packaged up into
one set here:
* Added `toolsrc/cmake/utilities.cmake`, which contains the following:
* `vcpkg_detect_compiler` -- get the name of the C++ compiler, as one
of {gcc, clang, msvc}
* `vcpkg_detect_standard_library` -- get the name of the standard
library we're linking to, as one of {libstdc++, libc++, msvc-stl}
* `vcpkg_detect_std_filesystem` -- figure out how to link and call
into C++17's filesystem; whether one needs to link to `stdc++fs` or
`c++fs`, and whether to use `<filesystem>` or
`<experimental/filesystem>`.
* Added a `VCPKG_WARNINGS_AS_ERRORS`, split off from
`VCPKG_DEVELOPMENT_WARNINGS`, which allows one to use the development
warnings without passing -Werror
* Rename `DEFINE_DISABLE_METRICS` to `VCPKG_DISABLE_METRICS` -- the
former will now print a deprecation message and set the latter.
* Now, print a deprecation message on `WERROR`; it doesn't do anything
since the behavior it requested is now the default.
* Pass `-std=c++17` if the compiler allows it, instead of `-std=c++1z`
* Do some code movement
* Pass `USE_STD_FILESYSTEM` if possible, instead of only on minGW
* Renamed to `VCPKG_USE_STD_FILESYSTEM`
Additionally, we now pass `/W4` in Debug mode on x86 in the Visual
Studio build system; this brings it in line with the CMake build system,
and the x64 Visual Studio build system.
And finally, we make some minor code changes to support compiling in
VCPKG_DEVELOPMENT_WARNINGS mode.
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/pch.h | 7 | ||||
| -rw-r--r-- | toolsrc/include/vcpkg/base/files.h | 4 |
2 files changed, 8 insertions, 3 deletions
diff --git a/toolsrc/include/pch.h b/toolsrc/include/pch.h index a6a442f0a..bdc13aedf 100644 --- a/toolsrc/include/pch.h +++ b/toolsrc/include/pch.h @@ -31,7 +31,7 @@ #include <cstdint> #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING #include <cstring> -#if USE_STD_FILESYSTEM +#if VCPKG_USE_STD_FILESYSTEM #include <filesystem> #else #include <experimental/filesystem> @@ -54,7 +54,12 @@ #else #include <sys/time.h> #endif + #include <sys/types.h> +// glibc defines major and minor in sys/types.h, and should not +#undef major +#undef minor + #include <system_error> #include <thread> #include <time.h> diff --git a/toolsrc/include/vcpkg/base/files.h b/toolsrc/include/vcpkg/base/files.h index 3b92feabe..0bad428c0 100644 --- a/toolsrc/include/vcpkg/base/files.h +++ b/toolsrc/include/vcpkg/base/files.h @@ -3,7 +3,7 @@ #include <vcpkg/base/expected.h> #include <vcpkg/base/ignore_errors.h> -#if USE_STD_FILESYSTEM +#if VCPKG_USE_STD_FILESYSTEM #include <filesystem> #else #define _SILENCE_EXPERIMENTAL_FILESYSTEM_DEPRECATION_WARNING @@ -12,7 +12,7 @@ namespace fs { -#if USE_STD_FILESYSTEM +#if VCPKG_USE_STD_FILESYSTEM namespace stdfs = std::filesystem; #else namespace stdfs = std::experimental::filesystem; |