diff options
| author | Connor Fitzgerald <connorwadefitzgerald@gmail.com> | 2019-05-13 20:51:16 -0400 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2019-05-13 17:51:16 -0700 |
| commit | d539182ccbf85bfef225194e1dc76e5ae2922f50 (patch) | |
| tree | 0dec4672053b5aeee8d3824f1819d7a7d610eb30 | |
| parent | 8a6c7f375b5561de70008021a54a535c2c30a89f (diff) | |
| download | vcpkg-d539182ccbf85bfef225194e1dc76e5ae2922f50.tar.gz vcpkg-d539182ccbf85bfef225194e1dc76e5ae2922f50.zip | |
[glm] Remove all unnecessary build steps (#6410)
* [glm] Remove all unnecessary build steps
* [glm] Fix header export
* [glm] Bump control to force rebuild
| -rw-r--r-- | ports/glm/CMakeLists.txt | 25 | ||||
| -rw-r--r-- | ports/glm/CONTROL | 2 | ||||
| -rw-r--r-- | ports/glm/disable_warnings_as_error.patch | 13 | ||||
| -rw-r--r-- | ports/glm/portfile.cmake | 14 |
4 files changed, 30 insertions, 24 deletions
diff --git a/ports/glm/CMakeLists.txt b/ports/glm/CMakeLists.txt new file mode 100644 index 000000000..006e7182e --- /dev/null +++ b/ports/glm/CMakeLists.txt @@ -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*"
+)
diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL index 1cc8a594c..b8c088f59 100644 --- a/ports/glm/CONTROL +++ b/ports/glm/CONTROL @@ -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 diff --git a/ports/glm/disable_warnings_as_error.patch b/ports/glm/disable_warnings_as_error.patch deleted file mode 100644 index f87616b1e..000000000 --- a/ports/glm/disable_warnings_as_error.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 756673a3..5fbc8906 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -216,7 +216,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC") - message("GLM: Visual C++ - ${CMAKE_CXX_COMPILER_ID} compiler") - endif() - -- add_compile_options(/W4 /WX) -+ add_compile_options(/W4) - add_compile_options(/wd4309 /wd4324 /wd4389 /wd4127 /wd4267 /wd4146 /wd4201 /wd4464 /wd4514 /wd4701 /wd4820 /wd4365) - add_definitions(-D_CRT_SECURE_NO_WARNINGS) - endif() diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index e0400f696..d38589a88 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -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/) |