forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[glew/openvdb/xtensor-io] Update to latest release version (microsoft…
…#20022) * [glew/openvdb/xtensor-io] Update to latest release version * [glew] Update patch * [xtensor-io] Update version
- Loading branch information
Showing
14 changed files
with
229 additions
and
234 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,17 @@ | ||
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt | ||
index 5081e0f..f76725a 100644 | ||
--- a/build/cmake/CMakeLists.txt | ||
+++ b/build/cmake/CMakeLists.txt | ||
@@ -108,7 +108,7 @@ if (MSVC) | ||
target_compile_options (glew PRIVATE -GS-) | ||
target_compile_options (glew_s PRIVATE -GS-) | ||
# remove stdlib dependency | ||
- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) | ||
+ # target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) | ||
string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) | ||
elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) | ||
# remove stdlib dependency on windows with GCC and Clang (for similar reasons | ||
diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt | ||
index 419c243..f81fab4 100644 | ||
--- a/build/cmake/CMakeLists.txt | ||
+++ b/build/cmake/CMakeLists.txt | ||
@@ -120,9 +120,9 @@ if (MSVC) | ||
target_compile_options (glew PRIVATE -GS-) | ||
target_compile_options (glew_s PRIVATE -GS-) | ||
# remove stdlib dependency | ||
- target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) | ||
- target_link_libraries (glew LINK_PRIVATE libvcruntime.lib) | ||
- target_link_libraries (glew LINK_PRIVATE msvcrt.lib ) | ||
+ #target_link_libraries (glew LINK_PRIVATE -nodefaultlib -noentry) | ||
+ #target_link_libraries (glew LINK_PRIVATE libvcruntime.lib) | ||
+ #target_link_libraries (glew LINK_PRIVATE msvcrt.lib ) | ||
string(REGEX REPLACE "/RTC(su|[1su])" "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG}) | ||
elseif (WIN32 AND ((CMAKE_C_COMPILER_ID MATCHES "GNU") OR (CMAKE_C_COMPILER_ID MATCHES "Clang"))) | ||
# remove stdlib dependency on windows with GCC and Clang (for similar reasons |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,17 @@ | ||
{ | ||
"name": "glew", | ||
"version-string": "2.1.0", | ||
"port-version": 11, | ||
"version-string": "2.2.0", | ||
"description": "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library.", | ||
"homepage": "https://github.com/nigels-com/glew", | ||
"dependencies": [ | ||
"opengl" | ||
"opengl", | ||
{ | ||
"name": "vcpkg-cmake", | ||
"host": true | ||
}, | ||
{ | ||
"name": "vcpkg-cmake-config", | ||
"host": true | ||
} | ||
] | ||
} |
Oops, something went wrong.