aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schumacher <roschuma@microsoft.com>2016-09-21 12:46:36 -0700
committerGitHub <noreply@github.com>2016-09-21 12:46:36 -0700
commitcd4dce10401fc3546b39f68e4d26990a936bd146 (patch)
tree68dc36b50dd9925208092be89cf2056d02fabafc
parente70a61d97213bb138f6a1d0e641e9ba7c5df3480 (diff)
parenta8f4f0563331a36d9327ef38a6b57c3300d2e538 (diff)
downloadvcpkg-cd4dce10401fc3546b39f68e4d26990a936bd146.tar.gz
vcpkg-cd4dce10401fc3546b39f68e4d26990a936bd146.zip
Merge pull request #50 from mcmihai/glm_fix
[glm] Removed CMakeLists.txt
-rw-r--r--ports/glm/portfile.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake
index 8bc466e34..0d4d08a6d 100644
--- a/ports/glm/portfile.cmake
+++ b/ports/glm/portfile.cmake
@@ -6,6 +6,9 @@ vcpkg_download_distfile(ARCHIVE
)
vcpkg_extract_source_archive(${ARCHIVE})
+# Remove glm/CMakeLists.txt
+file(REMOVE ${CURRENT_BUILDTREES_DIR}/src/glm/glm/CMakeLists.txt)
+
# Put the license file where vcpkg expects it
file(COPY ${CURRENT_BUILDTREES_DIR}/src/glm/copying.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glm/)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/glm/copying.txt ${CURRENT_PACKAGES_DIR}/share/glm/copyright)
@@ -13,5 +16,3 @@ file(RENAME ${CURRENT_PACKAGES_DIR}/share/glm/copying.txt ${CURRENT_PACKAGES_DIR
# Copy the glm header files
file(GLOB HEADER_FILES ${CURRENT_BUILDTREES_DIR}/src/glm/glm/*)
file(COPY ${HEADER_FILES} DESTINATION ${CURRENT_PACKAGES_DIR}/include/glm)
-vcpkg_copy_pdbs()
-