cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2025-02-14 00:05:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[glm, sqlitecpp] update to new version (#10977)

Browse Source 
* [glm] update to 0.9.9.8

* [sqlitecpp] Update to version 3.0.0
This commit is contained in:
Lily 2020-04-24 12:17:26 +08:00 committed by GitHub
parent 49822446b5
commit c3fc360947
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/glm/CONTROL
View File

@ -1,4 +1,4 @@
Source: glm Source: glm
Version: 0.9.9.7 Version: 0.9.9.8
Description: OpenGL Mathematics (GLM) Description: OpenGL Mathematics (GLM)
Homepage: https://glm.g-truc.net Homepage: https://glm.g-truc.net

4
ports/glm/portfile.cmake
View File

@ -1,8 +1,8 @@
vcpkg_from_github( vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH OUT_SOURCE_PATH SOURCE_PATH
REPO g-truc/glm REPO g-truc/glm
REF 0.9.9.7 REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8
SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c
HEAD_REF master HEAD_REF master
) )

20
ports/sqlitecpp/0001-Find-external-sqlite3.patch
View File

@ -1,14 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00e058c..489b884 100644 index 9363c0d..0f47f0f 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -199,7 +199,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME}) @@ -227,9 +227,9 @@ if (SQLITECPP_INTERNAL_SQLITE)
## Build provided copy of SQLite3 C library ## add_subdirectory(sqlite3)
target_link_libraries(SQLiteCpp PUBLIC sqlite3)
# TODO else (SQLITECPP_INTERNAL_SQLITE)
-#find_package(sqlite3) - find_package (SQLite3 REQUIRED)
+ find_package(sqlite3 CONFIG) + find_package(sqlite3 CONFIG)
message(STATUS "Link to sqlite3 system library")
- target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3)
+ target_link_libraries(SQLiteCpp PRIVATE sqlite3) + target_link_libraries(SQLiteCpp PRIVATE sqlite3)
#if(sqlite3_VERSION VERSION_LESS "3.19") if(SQLite3_VERSION VERSION_LESS "3.19")
# set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT")
#endif() endif()

2
ports/sqlitecpp/CONTROL
View File

@ -1,5 +1,5 @@
Source: sqlitecpp Source: sqlitecpp
Version: 2.3.0-1 Version: 3.0.0
Build-Depends: sqlite3 Build-Depends: sqlite3
Homepage: https://github.com/SRombauts/SQLiteCpp Homepage: https://github.com/SRombauts/SQLiteCpp
Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper. Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper.

8
ports/sqlitecpp/portfile.cmake
View File

@ -1,12 +1,10 @@
include(vcpkg_common_functions)
vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH
REPO "SRombauts/SQLiteCpp" REPO "SRombauts/SQLiteCpp"
REF 09dd10886c560ab5af41cfe694567f34c88cd101 REF be1a8eeace02ce98dfa3da688d1011c5bb895985 #v3.0.0
HEAD_REF master HEAD_REF master
SHA512 d0a440e2e96fca9aac7fe73d46bb6508825a82547dca1e9c93d8c3ca46878fa137e7a2a7a865bcfa641d0236e26307a3342d55fc83578552a37eec7565642d91 SHA512 d48b5915a2674f7f6da2737fa365e2202373e95cd20e819281b765a597e2fa8b8ae33f6553d65b6a8a93741e31633de3c75caf84fffa4313154c43ce634b1323
PATCHES PATCHES
0001-Find-external-sqlite3.patch 0001-Find-external-sqlite3.patch
) )
@ -27,4 +25,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SQLiteCpp)
vcpkg_copy_pdbs() vcpkg_copy_pdbs()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlitecpp RENAME copyright) file(INSTALL ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)