vcpkg/fix-min-max-macro.patch at b18ddfc9b538e1100bfd8f200d4a42a396fd09ae - vcpkg - Gitea

mirror/vcpkg

mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-17 08:17:55 +08:00

Lily Wang f4862747d9

[osg] Enable macro NOMINMAX on windows (#38780 )

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>

2024-05-31 12:41:16 -07:00

14 lines

363 B

Diff

Raw Blame History

 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()