early-access version 2853
This commit is contained in:
13
externals/vcpkg/ports/globjects/fix-dependency-glm.patch
vendored
Executable file
13
externals/vcpkg/ports/globjects/fix-dependency-glm.patch
vendored
Executable file
@@ -0,0 +1,13 @@
|
||||
diff --git a/source/globjects/CMakeLists.txt b/source/globjects/CMakeLists.txt
|
||||
index 71e92d8..b8b4408 100644
|
||||
--- a/source/globjects/CMakeLists.txt
|
||||
+++ b/source/globjects/CMakeLists.txt
|
||||
@@ -359,7 +359,7 @@ target_link_libraries(${target}
|
||||
|
||||
PUBLIC
|
||||
${DEFAULT_LIBRARIES}
|
||||
- glm
|
||||
+ glm::glm
|
||||
glbinding::glbinding
|
||||
glbinding::glbinding-aux
|
||||
|
37
externals/vcpkg/ports/globjects/portfile.cmake
vendored
Executable file
37
externals/vcpkg/ports/globjects/portfile.cmake
vendored
Executable file
@@ -0,0 +1,37 @@
|
||||
vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO cginternals/globjects
|
||||
REF dc68b09a53ec20683d3b3a12ed8d9cb12602bb9a
|
||||
SHA512 5145df795a73a8d74e983e143fd57441865f3082860efb89a3aa8c4d64c2eb6f0256a8049ccd5479dd77e53ef6638d9c903b29a8ef2b41a076003d9595912500
|
||||
HEAD_REF master
|
||||
PATCHES
|
||||
system-install.patch
|
||||
fix-dependency-glm.patch
|
||||
)
|
||||
|
||||
vcpkg_configure_cmake(
|
||||
SOURCE_PATH ${SOURCE_PATH}
|
||||
PREFER_NINJA
|
||||
OPTIONS
|
||||
-DOPTION_BUILD_TESTS=OFF
|
||||
-DOPTION_BUILD_GPU_TESTS=OFF
|
||||
-DGIT_REV=0
|
||||
)
|
||||
|
||||
vcpkg_install_cmake()
|
||||
|
||||
vcpkg_fixup_cmake_targets(CONFIG_PATH share/globjects/cmake/globjects)
|
||||
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
|
||||
|
||||
file(WRITE ${CURRENT_PACKAGES_DIR}/share/globjects/globjects-config.cmake "include(CMakeFindDependencyMacro)
|
||||
find_dependency(glm)
|
||||
find_dependency(glbinding)
|
||||
|
||||
include(\${CMAKE_CURRENT_LIST_DIR}/globjects-export.cmake)
|
||||
")
|
||||
|
||||
# Handle copyright
|
||||
file(RENAME ${CURRENT_PACKAGES_DIR}/share/globjects/LICENSE ${CURRENT_PACKAGES_DIR}/share/globjects/copyright)
|
||||
|
||||
vcpkg_copy_pdbs()
|
27
externals/vcpkg/ports/globjects/system-install.patch
vendored
Executable file
27
externals/vcpkg/ports/globjects/system-install.patch
vendored
Executable file
@@ -0,0 +1,27 @@
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 6556346..48ba95d 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -42,11 +42,13 @@ include(cmake/GenerateTemplateExportHeader.cmake)
|
||||
#
|
||||
|
||||
# Get git revision
|
||||
+if(NOT DEFINED GIT_REV)
|
||||
get_git_head_revision(GIT_REFSPEC GIT_SHA1)
|
||||
string(SUBSTRING "${GIT_SHA1}" 0 12 GIT_REV)
|
||||
if(NOT GIT_SHA1)
|
||||
set(GIT_REV "0")
|
||||
endif()
|
||||
+endif()
|
||||
|
||||
# Meta information about the project
|
||||
set(META_PROJECT_NAME "globjects")
|
||||
@@ -133,7 +135,7 @@ if("${CMAKE_INSTALL_PREFIX}" STREQUAL "/usr" OR "${CMAKE_INSTALL_PREFIX}" STREQU
|
||||
endif()
|
||||
|
||||
# Installation paths
|
||||
-if(UNIX AND SYSTEM_DIR_INSTALL)
|
||||
+if(1)
|
||||
# Install into the system (/usr/bin or /usr/local/bin)
|
||||
set(INSTALL_ROOT "share/${project}") # /usr/[local]/share/<project>
|
||||
set(INSTALL_CMAKE "share/${project}/cmake") # /usr/[local]/share/<project>/cmake
|
11
externals/vcpkg/ports/globjects/vcpkg.json
vendored
Executable file
11
externals/vcpkg/ports/globjects/vcpkg.json
vendored
Executable file
@@ -0,0 +1,11 @@
|
||||
{
|
||||
"name": "globjects",
|
||||
"version-string": "1.1.0",
|
||||
"port-version": 4,
|
||||
"description": "C++ library strictly wrapping OpenGL objects",
|
||||
"homepage": "https://github.com/cginternals/globjects",
|
||||
"dependencies": [
|
||||
"glbinding",
|
||||
"glm"
|
||||
]
|
||||
}
|
Reference in New Issue
Block a user