diff --git a/ports/glm/CONTROL b/ports/glm/CONTROL index f58bbb0d7..3ba2f552d 100644 --- a/ports/glm/CONTROL +++ b/ports/glm/CONTROL @@ -1,4 +1,4 @@ Source: glm -Version: 0.9.9.7 +Version: 0.9.9.8 Description: OpenGL Mathematics (GLM) Homepage: https://glm.g-truc.net diff --git a/ports/glm/portfile.cmake b/ports/glm/portfile.cmake index 4d20a0ed6..40d5115ac 100644 --- a/ports/glm/portfile.cmake +++ b/ports/glm/portfile.cmake @@ -1,8 +1,8 @@ vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO g-truc/glm - REF 0.9.9.7 - SHA512 9c557788d6382777317c94f8b30bc3df7e533877705514fa5d384f97b076d6bc750e841acbecdec8113e21af07bd8850159f5f1e079aaa2cde25540b480f983b + REF bf71a834948186f4097caa076cd2663c69a10e1e #v0.9.9.8 + SHA512 226266c02af616a96fb19ee32cf3f98347daa43a4fde5d618d36b38709dce1280de126c542524d40725ecf70359edcc5b60660554c65ce246514501fb4c9c87c HEAD_REF master ) diff --git a/ports/sqlitecpp/0001-Find-external-sqlite3.patch b/ports/sqlitecpp/0001-Find-external-sqlite3.patch index a59df97ae..b2371490c 100644 --- a/ports/sqlitecpp/0001-Find-external-sqlite3.patch +++ b/ports/sqlitecpp/0001-Find-external-sqlite3.patch @@ -1,14 +1,16 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 00e058c..489b884 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -199,7 +199,8 @@ install(EXPORT ${PROJECT_NAME}Config DESTINATION lib/cmake/${PROJECT_NAME}) - ## Build provided copy of SQLite3 C library ## - - # TODO --#find_package(sqlite3) -+find_package(sqlite3 CONFIG) -+target_link_libraries(SQLiteCpp PRIVATE sqlite3) - #if(sqlite3_VERSION VERSION_LESS "3.19") - # set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") - #endif() +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9363c0d..0f47f0f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -227,9 +227,9 @@ if (SQLITECPP_INTERNAL_SQLITE) + add_subdirectory(sqlite3) + target_link_libraries(SQLiteCpp PUBLIC sqlite3) + else (SQLITECPP_INTERNAL_SQLITE) +- find_package (SQLite3 REQUIRED) ++ find_package(sqlite3 CONFIG) + message(STATUS "Link to sqlite3 system library") +- target_link_libraries(SQLiteCpp PUBLIC SQLite::SQLite3) ++ target_link_libraries(SQLiteCpp PRIVATE sqlite3) + if(SQLite3_VERSION VERSION_LESS "3.19") + set_target_properties(SQLiteCpp PROPERTIES COMPILE_FLAGS "-DSQLITECPP_HAS_MEM_STRUCT") + endif() diff --git a/ports/sqlitecpp/CONTROL b/ports/sqlitecpp/CONTROL index 8f6017a29..d05dcec85 100644 --- a/ports/sqlitecpp/CONTROL +++ b/ports/sqlitecpp/CONTROL @@ -1,5 +1,5 @@ Source: sqlitecpp -Version: 2.3.0-1 +Version: 3.0.0 Build-Depends: sqlite3 Homepage: https://github.com/SRombauts/SQLiteCpp Description: SQLiteC++ (SQLiteCpp) is a smart and easy to use C++ SQLite3 wrapper. diff --git a/ports/sqlitecpp/portfile.cmake b/ports/sqlitecpp/portfile.cmake index 210ca3dd6..9f2febab0 100644 --- a/ports/sqlitecpp/portfile.cmake +++ b/ports/sqlitecpp/portfile.cmake @@ -1,12 +1,10 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_from_github(OUT_SOURCE_PATH SOURCE_PATH REPO "SRombauts/SQLiteCpp" - REF 09dd10886c560ab5af41cfe694567f34c88cd101 + REF be1a8eeace02ce98dfa3da688d1011c5bb895985 #v3.0.0 HEAD_REF master - SHA512 d0a440e2e96fca9aac7fe73d46bb6508825a82547dca1e9c93d8c3ca46878fa137e7a2a7a865bcfa641d0236e26307a3342d55fc83578552a37eec7565642d91 + SHA512 d48b5915a2674f7f6da2737fa365e2202373e95cd20e819281b765a597e2fa8b8ae33f6553d65b6a8a93741e31633de3c75caf84fffa4313154c43ce634b1323 PATCHES 0001-Find-external-sqlite3.patch ) @@ -27,4 +25,4 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/SQLiteCpp) vcpkg_copy_pdbs() 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)