mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 00:51:49 +08:00
f4862747d9
Fixes #38688 - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] ~~SHA512s are updated for each updated download.~~ - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] ~~Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file.~~ - [ ] ~~Any patches that are no longer applied are deleted from the port's directory.~~ - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. --------- Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
14 lines
363 B
Diff
14 lines
363 B
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 2a58f19..7d0acf8 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -375,7 +375,7 @@ IF(WIN32 AND NOT ANDROID)
|
|
#needed for net plugin
|
|
SET (OSG_SOCKET_LIBS wsock32)
|
|
# Both Cygwin and Msys need -DNOMINMAX ???
|
|
- IF(UNIX)
|
|
+ IF(UNIX OR WIN32)
|
|
ADD_DEFINITIONS(-DNOMINMAX)
|
|
ENDIF()
|
|
|