diff options
| author | Tim Kientzle <kientzle@acm.org> | 2022-10-01 09:46:21 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-01 09:46:21 -0700 |
| commit | fa86fb55860db2b305436c82d7e890fde832d3d6 (patch) | |
| tree | 8bbabb6f965acf7ff3fdfaaa35b12de637f22ceb | |
| parent | 5822701d790787500f5b75745bbe11dfc30a23d2 (diff) | |
| parent | 6801a72707b9923fad868442f1e4e319464051d8 (diff) | |
| download | libarchive-fa86fb55860db2b305436c82d7e890fde832d3d6.tar.gz | |
Merge pull request #1777 from vtorri/vtorri_win10_1
cmake: update possible values of WINDOWS_VERSION to also support Windows 10
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 93b86371..ea50faf5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -243,7 +243,11 @@ IF(ENABLE_TEST) ENDIF(ENABLE_TEST) IF(WIN32) - IF(WINDOWS_VERSION STREQUAL "WIN8") + IF(WINDOWS_VERSION STREQUAL "WIN10") + SET(NTDDI_VERSION 0x0A000000) + SET(_WIN32_WINNT 0x0A00) + SET(WINVER 0x0A00) + ELSEIF(WINDOWS_VERSION STREQUAL "WIN8") SET(NTDDI_VERSION 0x06020000) SET(_WIN32_WINNT 0x0602) SET(WINVER 0x0602) @@ -267,12 +271,12 @@ IF(WIN32) SET(NTDDI_VERSION 0x05010000) SET(_WIN32_WINNT 0x0501) SET(WINVER 0x0501) - ELSE(WINDOWS_VERSION STREQUAL "WIN8") + ELSE(WINDOWS_VERSION STREQUAL "WIN10") # Default to Windows Server 2003 API if we don't recognize the specifier SET(NTDDI_VERSION 0x05020000) SET(_WIN32_WINNT 0x0502) SET(WINVER 0x0502) - ENDIF(WINDOWS_VERSION STREQUAL "WIN8") + ENDIF(WINDOWS_VERSION STREQUAL "WIN10") ENDIF(WIN32) IF(MSVC) |