aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Sinigardi <stesinigardi@hotmail.com>2017-11-08 14:55:46 +0100
committerStefano Sinigardi <stesinigardi@hotmail.com>2017-11-08 14:55:46 +0100
commit68bfea163aaa59d59e9e45954fa1777028c7f770 (patch)
tree9e228c0bfe2e20ed2920df849faaaa4e189a50b9
parent9ea963dcec629b03994cf21e78b152efc3e2c0b0 (diff)
downloadvcpkg-68bfea163aaa59d59e9e45954fa1777028c7f770.tar.gz
vcpkg-68bfea163aaa59d59e9e45954fa1777028c7f770.zip
rename freeglut_static.lib for compatibility with FindGLUT.cmake
-rw-r--r--ports/freeglut/CONTROL2
-rw-r--r--ports/freeglut/portfile.cmake8
2 files changed, 8 insertions, 2 deletions
diff --git a/ports/freeglut/CONTROL b/ports/freeglut/CONTROL
index 82f0dc1f1..d7c3801f7 100644
--- a/ports/freeglut/CONTROL
+++ b/ports/freeglut/CONTROL
@@ -1,3 +1,3 @@
Source: freeglut
-Version: 3.0.0-2
+Version: 3.0.0-3
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 c2d1f2816..33861a7eb 100644
--- a/ports/freeglut/portfile.cmake
+++ b/ports/freeglut/portfile.cmake
@@ -35,11 +35,17 @@ vcpkg_install_cmake()
# Patch header
file(READ ${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h FREEGLUT_STDH)
string(REPLACE "pragma comment (lib, \"freeglut_staticd.lib\")"
- "pragma comment (lib, \"freeglut_static.lib\")" FREEGLUT_STDH "${FREEGLUT_STDH}")
+ "pragma comment (lib, \"freeglut.lib\")" FREEGLUT_STDH "${FREEGLUT_STDH}")
string(REPLACE "pragma comment (lib, \"freeglutd.lib\")"
"pragma comment (lib, \"freeglut.lib\")" FREEGLUT_STDH "${FREEGLUT_STDH}")
file(WRITE ${CURRENT_PACKAGES_DIR}/include/GL/freeglut_std.h "${FREEGLUT_STDH}")
+# Rename static lib (otherwise it's incompatible with FindGLUT.cmake)
+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_static.lib ${CURRENT_PACKAGES_DIR}/debug/lib/freeglut.lib)
+endif()
+
# Clean
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)