diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-08-10 12:32:34 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-10 12:32:34 -0700 |
| commit | 895678db8f8bfc3c1988a118b3bb5a13ea4d5248 (patch) | |
| tree | f341f05574a16589e7e0ee15446a907e142e679c /toolsrc/windows-bootstrap | |
| parent | 481738beaeb77bca19ff7fa01b4c02be7fc9deb2 (diff) | |
| download | vcpkg-895678db8f8bfc3c1988a118b3bb5a13ea4d5248.tar.gz vcpkg-895678db8f8bfc3c1988a118b3bb5a13ea4d5248.zip | |
[vcpkg] Rewrite CMake build system to be more target-based (#12698)
* Change to using more target-focused cmake
* Add vcpkg_target_add_warning_options
* targetify the rest
* move the globs together
* Force-include pch.h on non-windows
* Rename VCPKGLIB_NON_PCH_* to VCPKGLIB_* in globs
* Remove `include "pch.h"`s
* missed a few lines
* fix build
* fix CMAKE_CURRENT_SOURCE_DIR
* try to fix VCPKG_REQUIRE_LINK_CXXFS
* change msvc-stl logic
* fix build
* CR
* clang-format
* Apply suggestions from code review
Thanks @ras0219!
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Diffstat (limited to 'toolsrc/windows-bootstrap')
| -rw-r--r-- | toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj index cd98c2256..2c980039e 100644 --- a/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj +++ b/toolsrc/windows-bootstrap/vcpkglib/vcpkglib.vcxproj @@ -83,6 +83,7 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
</ItemDefinitionGroup>
@@ -97,6 +98,7 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
<MinimalRebuild>false</MinimalRebuild>
</ClCompile>
</ItemDefinitionGroup>
@@ -113,6 +115,7 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -132,6 +135,7 @@ <MultiProcessorCompilation>true</MultiProcessorCompilation>
<PrecompiledHeader>Use</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+ <ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
</ClCompile>
<Link>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|