Skip to content

[glm] Remove all unnecessary build steps #6410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ras0219-msft merged 3 commits into from
May 14, 2019
Merged

[glm] Remove all unnecessary build steps #6410

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f4b92c3
[glm] Remove all unnecessary build steps
cwfitzgerald May 11, 2019
dad02ef
[glm] Fix header export
cwfitzgerald May 13, 2019
30f1587
[glm] Bump control to force rebuild
ras0219-msft May 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions ports/glm/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)

project(glm LANGUAGES CXX)

add_library(glm INTERFACE)
target_include_directories(glm INTERFACE $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>)

include(GNUInstallDirs)

install(
TARGETS glm EXPORT glm-config
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}/
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/
)

install(
EXPORT glm-config DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/glm
)

install(
DIRECTORY ${CMAKE_SOURCE_DIR}/glm
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
FILES_MATCHING PATTERN "*.hpp*" PATTERN "*.inl*" PATTERN "*.h*"
)
2 changes: 1 addition & 1 deletion ports/glm/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
Source: glm
Version: 0.9.9.5
Version: 0.9.9.5-2
Description: OpenGL Mathematics (GLM) https://glm.g-truc.net
13 changes: 0 additions & 13 deletions ports/glm/disable_warnings_as_error.patch
View file
Open in desktop

This file was deleted.

14 changes: 4 additions & 10 deletions ports/glm/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,17 @@ vcpkg_from_github(
HEAD_REF master
)

vcpkg_apply_patches(
SOURCE_PATH ${SOURCE_PATH}
PATCHES "${CMAKE_CURRENT_LIST_DIR}/disable_warnings_as_error.patch"
)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets()

vcpkg_fixup_cmake_targets(CONFIG_PATH "lib/cmake/glm")

vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)

# Put the license file where vcpkg expects it
file(COPY ${SOURCE_PATH}/manual.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/)
Expand Down