diff options
| author | myd7349 <myd7349@gmail.com> | 2020-01-23 04:19:17 +0800 |
|---|---|---|
| committer | Victor Romero <romerosanchezv@gmail.com> | 2020-01-22 12:19:17 -0800 |
| commit | 6e99bd4018686495c2d6759f1f749451b745baab (patch) | |
| tree | 18430440dab66132fd43bf2b347057d7d15704d1 | |
| parent | 65d1fa637371d27c6a101c9c001aa00d73fc3d7c (diff) | |
| download | vcpkg-6e99bd4018686495c2d6759f1f749451b745baab.tar.gz vcpkg-6e99bd4018686495c2d6759f1f749451b745baab.zip | |
[freeglut] Patch header correctly (#9725)
This fixes bug introduced by #9155.
| -rw-r--r-- | ports/freeglut/CONTROL | 2 | ||||
| -rw-r--r-- | ports/freeglut/portfile.cmake | 14 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL index 5f42478d8..05cd80860 100644 --- a/ports/freeglut/CONTROL +++ b/ports/freeglut/CONTROL @@ -1,4 +1,4 @@ Source: freeglut -Version: 3.0.0-8 +Version: 3.0.0-9 Homepage: https://sourceforge.net/projects/freeglut/ Description: Open source implementation of GLUT with source and binary backwards compatibility. diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index bb22ac684..e46afcf9b 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -32,14 +32,6 @@ string(REGEX REPLACE "\"freeglut_static.lib\"" "\"freeglut.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") string(REGEX REPLACE "\"freeglut_staticd.lib\"" "\"freeglutd.lib\"" FREEGLUT_STDH "${FREEGLUT_STDH}") -if(VCPKG_LIBRARY_LINKAGE STREQUAL static) - string(REPLACE - "ifdef FREEGLUT_STATIC" - "if 1 //ifdef FREEGLUT_STATIC" - FREEGLUT_STDH - "${FREEGLUT_STDH}" - ) -endif() file(WRITE ${SOURCE_PATH}/include/GL/freeglut_std.h "${FREEGLUT_STDH}") vcpkg_configure_cmake( @@ -60,6 +52,12 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") file(RENAME ${CURRENT_PACKAGES_DIR}/lib/freeglut_static.lib ${CURRENT_PACKAGES_DIR}/lib/freeglut.lib) file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut_staticd.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglutd.lib) endif() + + vcpkg_replace_string( + "${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h" + "ifdef FREEGLUT_STATIC" + "if 1 //ifdef FREEGLUT_STATIC" + ) endif() # Clean |