diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-05-09 20:45:23 +0200 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-05-09 11:45:23 -0700 |
| commit | 9c33de2d07e3f28ce52ea6520c9d8d23f83a1c8d (patch) | |
| tree | 9c6eb0e03cacd136e2e00d7877fb11c87205b0ec /ports/freeglut | |
| parent | 223d5d82ac06cefc009c7c125771f5569d086ac5 (diff) | |
| download | vcpkg-9c33de2d07e3f28ce52ea6520c9d8d23f83a1c8d.tar.gz vcpkg-9c33de2d07e3f28ce52ea6520c9d8d23f83a1c8d.zip | |
[freeimage,freeglut,giflib,libwebp] port patches from #5169 (#6364)
* [freeimage] improve compatibility with other ports, using typedefs identical to other headers to avoid errors
* [libwebp] fixes for non-win32 systems
* [giflib] revert again #5578
* [freeglut] add missing wrapper for linux
Diffstat (limited to 'ports/freeglut')
| -rw-r--r-- | ports/freeglut/portfile.cmake | 6 | ||||
| -rw-r--r-- | ports/freeglut/vcpkg-cmake-wrapper.cmake | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/ports/freeglut/portfile.cmake b/ports/freeglut/portfile.cmake index 1659c002d..86d691593 100644 --- a/ports/freeglut/portfile.cmake +++ b/ports/freeglut/portfile.cmake @@ -15,7 +15,7 @@ vcpkg_extract_source_archive_ex( ) if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore") - message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev\nOn macOS Xquartz is required.") + message("Freeglut currently requires the following libraries from the system package manager:\n opengl\n glu\n libx11\n xrandr\n xi\n xxf86vm\n\nThese can be installed on Ubuntu systems via apt-get install libxi-dev libgl1-mesa-dev libglu1-mesa-dev mesa-common-dev libxrandr-dev libxxf86vm-dev\nOn macOS Xquartz is required.") endif() if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic) @@ -62,3 +62,7 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/freeglut/COPYING ${CURRENT_PACKAGES_DI vcpkg_copy_pdbs() file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) + +if(VCPKG_CMAKE_SYSTEM_NAME STREQUAL "Linux") + file(COPY ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glut) +endif() diff --git a/ports/freeglut/vcpkg-cmake-wrapper.cmake b/ports/freeglut/vcpkg-cmake-wrapper.cmake new file mode 100644 index 000000000..5d57ad490 --- /dev/null +++ b/ports/freeglut/vcpkg-cmake-wrapper.cmake @@ -0,0 +1,10 @@ +_find_package(${ARGS})
+if(GLUT_FOUND)
+ find_library(XRANDR_LIBRARY NAMES xrandr Xrandr)
+ if(XRANDR_LIBRARY)
+ list(APPEND GLUT_LIBRARIES ${XRANDR_LIBRARY})
+ if(TARGET GLUT::GLUT)
+ set_property(TARGET GLUT::GLUT APPEND PROPERTY INTERFACE_LINK_LIBRARIES ${XRANDR_LIBRARY})
+ endif()
+ endif()
+endif()
|