Skip to content

[soci] update to 4.0.2 #18526

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 12 commits into from
Sep 16, 2021
Merged

[soci] update to 4.0.2 #18526

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f45dba0
[soci] update to 4.0.2
JonLiu1993 Jun 18, 2021
f2180df
update version
JonLiu1993 Jun 18, 2021
bfc1d30
update portfile.cmake
JonLiu1993 Jun 22, 2021
48ab14c
update version
JonLiu1993 Jun 22, 2021
1628bd3
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Jul 29, 2021
674b438
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Jul 30, 2021
441fb30
fix ci error
JonLiu1993 Jul 30, 2021
faa1086
update version
JonLiu1993 Jul 30, 2021
e3fcb12
Merge branch 'master' of https://github.com/Microsoft/vcpkg into dev/…
JonLiu1993 Sep 10, 2021
bbae136
fix-mysql-feature
JonLiu1993 Sep 10, 2021
d762c02
update version
JonLiu1993 Sep 10, 2021
7799c7b
Add comment explaining fix-mysql-feature-error.patch
BillyONeal Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 8 additions & 25 deletions ports/soci/export-include-dirs.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
diff --git a/cmake/SociBackend.cmake b/cmake/SociBackend.cmake
index 442d81d..ef56422 100644
index 5d4ef0d..bb0edf2 100644
--- a/cmake/SociBackend.cmake
+++ b/cmake/SociBackend.cmake
@@ -159,8 +159,13 @@ macro(soci_backend NAME)
@@ -159,8 +159,14 @@ macro(soci_backend NAME)
${THIS_BACKEND_HEADERS})

target_link_libraries(${THIS_BACKEND_TARGET}
Expand All @@ -12,42 +12,25 @@ index 442d81d..ef56422 100644
+
+ target_include_directories(${THIS_BACKEND_TARGET}
+ PUBLIC
+ ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS})
+ ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS}
+ )

if(WIN32)
set_target_properties(${THIS_BACKEND_TARGET}
@@ -197,8 +202,14 @@ macro(soci_backend NAME)
@@ -197,9 +203,15 @@ macro(soci_backend NAME)

# Still need to link the libraries for tests to work
target_link_libraries (${THIS_BACKEND_TARGET_STATIC}
+ PUBLIC
${THIS_BACKEND_DEPENDS_LIBRARIES}
)
-
+
+ target_include_directories(${THIS_BACKEND_TARGET_STATIC}
+ PUBLIC
+ ${THIS_BACKEND_DEPENDS_INCLUDE_DIRS}
+ )

+
set_target_properties(${THIS_BACKEND_TARGET_STATIC}
PROPERTIES
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 3916cce..d537613 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -64,6 +64,7 @@ if (SOCI_SHARED)
target_include_directories(${SOCI_CORE_TARGET}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
+ $<INSTALL_INTERFACE:include>
)

endif()
@@ -96,6 +97,7 @@ if (SOCI_STATIC)
target_include_directories(${SOCI_CORE_TARGET_STATIC}
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../../include>
+ $<INSTALL_INTERFACE:include>
)

endif()
OUTPUT_NAME ${THIS_BACKEND_OUTPUT_NAME}
10 changes: 4 additions & 6 deletions ports/soci/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO SOCI/soci
REF 334cc55d9fa7b42d7214a8533a246d637bc92899 #version 4.0.1 commit on 2020.10.19
SHA512 b300b13f68347d78252812e09efffb1735072cf5019940da53366a5cdee997f4b8b03a584a87a95ba764b0a78640ad6eb4966b53f9156280cb452465607afbc7
REF 99e2d567161a302de4f99832af76e6d3b75b68e6 #version 4.0.2
SHA512 d08d2383808d46d5e9550e9c7d93fb405d9e336eb38d974ba429e5b9446d3af53d4e702b90e80c67e298333da0145457fa1146d9773322676030be69de4ec4f4
HEAD_REF master
PATCHES
fix-dependency-libmysql.patch
Expand Down Expand Up @@ -51,9 +51,7 @@ vcpkg_configure_cmake(

vcpkg_install_cmake()
vcpkg_copy_pdbs()
vcpkg_fixup_cmake_targets(CONFIG_PATH cmake)
# Correct the config file name
file(RENAME ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCI.cmake ${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake)
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/${PORT})

if ("mysql" IN_LIST FEATURES)
vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/share/${PORT}/SOCIConfig.cmake
Expand All @@ -62,7 +60,7 @@ if ("mysql" IN_LIST FEATURES)
)
endif()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include ${CURRENT_PACKAGES_DIR}/debug/share)
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE_1_0.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
3 changes: 1 addition & 2 deletions ports/soci/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"name": "soci",
"version": "4.0.1",
"port-version": 3,
"version": "4.0.2",
"description": "SOCI database access library",
"homepage": "https://github.com/SOCI/soci",
"features": {
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5893,8 +5893,8 @@
"port-version": 0
},
"soci": {
"baseline": "4.0.1",
"port-version": 3
"baseline": "4.0.2",
"port-version": 0
},
"socket-io-client": {
"baseline": "3.0.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/s-/soci.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "61c9f1b6bea338fc3e6b57a49d04d109f55a1fa7",
"version": "4.0.2",
"port-version": 0
},
{
"git-tree": "05767aa636348d9fb5a2507a2c348091cc9d7782",
"version": "4.0.1",
Expand Down