From 869b5d7b341ddae690a84a09625e8942e77a90b3 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Mon, 13 Jul 2020 21:49:41 +0200 Subject: [PATCH 1/2] [glew] fix pkgconfig --- ports/glew/CONTROL | 3 ++- ports/glew/portfile.cmake | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ports/glew/CONTROL b/ports/glew/CONTROL index 9a7fd7e9c2324e..87a9c0a37abc04 100644 --- a/ports/glew/CONTROL +++ b/ports/glew/CONTROL @@ -1,4 +1,5 @@ Source: glew -Version: 2.1.0-7 +Version: 2.1.0 +Port-Version: 8 Description: The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library. Homepage: https://github.com/nigels-com/glew diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index 504a91dcf4a976..52add6cb7af27d 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - # Don't change to vcpkg_from_github! The sources in the git repository (archives) are missing some files that are distributed inside releases. # More info: https://github.com/nigels-com/glew/issues/31 and https://github.com/nigels-com/glew/issues/13 vcpkg_download_distfile(ARCHIVE @@ -25,6 +23,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake() vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/glew) +vcpkg_fixup_pkgconfig(SYSTEM_LIBRARIES GLU GL) if(VCPKG_TARGET_IS_WINDOWS) set(_targets_cmake_files) From e1a161dfc925108a9669f007b34ff667d4632f55 Mon Sep 17 00:00:00 2001 From: Alexander Neumann Date: Sat, 1 Aug 2020 22:15:41 +0200 Subject: [PATCH 2/2] update portfile --- ports/glew/portfile.cmake | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/ports/glew/portfile.cmake b/ports/glew/portfile.cmake index d0f1fb65afd6dc..31d5361b585e09 100644 --- a/ports/glew/portfile.cmake +++ b/ports/glew/portfile.cmake @@ -14,7 +14,7 @@ vcpkg_extract_source_archive_ex( ) vcpkg_configure_cmake( - SOURCE_PATH ${SOURCE_PATH}/build/cmake + SOURCE_PATH "${SOURCE_PATH}/build/cmake" PREFER_NINJA DISABLE_PARALLEL_CONFIGURE OPTIONS @@ -40,18 +40,18 @@ foreach(FILE ${_targets_cmake_files}) file(WRITE ${FILE} "${_contents}") endforeach() -if(EXISTS ${CURRENT_PACKAGES_DIR}/lib/libglew32.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/lib/libglew32.lib ${CURRENT_PACKAGES_DIR}/lib/glew32.lib) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib") + file(RENAME "${CURRENT_PACKAGES_DIR}/lib/libglew32.lib" "${CURRENT_PACKAGES_DIR}/lib/glew32.lib") endif() if(EXISTS ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib) - file(RENAME ${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib ${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib) + file(RENAME "${CURRENT_PACKAGES_DIR}/debug/lib/libglew32d.lib" "${CURRENT_PACKAGES_DIR}/debug/lib/glew32d.lib") endif() endif() if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/bin) - file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin) - foreach(FILE ${CURRENT_PACKAGES_DIR}/include/GL/glew.h ${CURRENT_PACKAGES_DIR}/include/GL/wglew.h ${CURRENT_PACKAGES_DIR}/include/GL/glxew.h) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin") + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin") + foreach(FILE "${CURRENT_PACKAGES_DIR}/include/GL/glew.h" "${CURRENT_PACKAGES_DIR}/include/GL/wglew.h" "${CURRENT_PACKAGES_DIR}/include/GL/glxew.h") file(READ ${FILE} _contents) string(REPLACE "#ifdef GLEW_STATIC" "#if 1" _contents "${_contents}") file(WRITE ${FILE} "${_contents}") @@ -60,9 +60,8 @@ endif() 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/include") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -file(INSTALL ${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake DESTINATION ${CURRENT_PACKAGES_DIR}/share/glew ) -file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/glew RENAME copyright) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/usage DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT}) +file(INSTALL "${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}") +file(INSTALL "${SOURCE_PATH}/LICENSE.txt" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)