Skip to content
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

Jump to bottom

[oatpp-sqlite] port added #14107

Merged
merged 22 commits into from
Oct 30, 2020
Merged

[oatpp-sqlite] port added #14107

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
fda667e
[oatpp] Update to 1.2.0
KaungZawHtet Oct 15, 2020
718c980
fixed UWP build err of oatpp at v1.2.0
KaungZawHtet Oct 16, 2020
8ede7c8
[oatpp-sqlite] port added
KaungZawHtet Oct 19, 2020
16951b5
fixed oatpp-sqlite & removed all of lib type config
KaungZawHtet Oct 25, 2020
62b3e38
sqlite dependency fixed for experimental
KaungZawHtet Oct 27, 2020
c46a53a
experiment with VCPKG_TOOLCHAIN
KaungZawHtet Oct 27, 2020
18973db
move to original repository
KaungZawHtet Oct 27, 2020
aad31ad
fixed to reach Avocato Oats
KaungZawHtet Oct 27, 2020
7462c41
Merge branch 'master' into oatpp-port-update-1.2.0
KaungZawHtet Oct 27, 2020
bde77ae
bump control files of oatpps except oatpp-sqlite
KaungZawHtet Oct 29, 2020
0a25bc5
Update portfile.cmake
NancyLi1013 Oct 29, 2020
cad2763
Update portfile.cmake
NancyLi1013 Oct 29, 2020
4406369
Update portfile.cmake
NancyLi1013 Oct 29, 2020
fa5763e
Update portfile.cmake
NancyLi1013 Oct 29, 2020
3e67e8d
Update portfile.cmake
NancyLi1013 Oct 29, 2020
3018715
Update portfile.cmake
NancyLi1013 Oct 29, 2020
8e23524
Port version follows lib's version
KaungZawHtet Oct 29, 2020
144960a
Update portfile.cmake
NancyLi1013 Oct 29, 2020
10628a8
Merge branch 'oatpp-port-update-1.2.0' of https://github.com/KaungZaw…
KaungZawHtet Oct 29, 2020
7a294aa
Update portfile.cmake
NancyLi1013 Oct 29, 2020
1cfe672
Update ports/oatpp-sqlite/portfile.cmake
NancyLi1013 Oct 29, 2020
30f4c51
Update ports/oatpp-sqlite/portfile.cmake
NancyLi1013 Oct 29, 2020
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
1 change: 1 addition & 0 deletions ports/oatpp-consul/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: oatpp-consul
Version: 1.2.0
Port-Version: 1
Description: OAT++ Modern web framework consul module
Build-Depends: oatpp
Homepage: https://github.com/oatpp/oatpp-consul
10 changes: 2 additions & 8 deletions ports/oatpp-consul/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,14 @@ vcpkg_from_github(
HEAD_REF master
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON")
else()
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF")
endif()

vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
"-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-consul-${OATPP_VERSION})
vcpkg_copy_pdbs()
Expand Down
1 change: 1 addition & 0 deletions ports/oatpp-curl/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: oatpp-curl
Version: 1.2.0
Port-Version: 1
Description: Oat++ Modern web framework curl module to use libcurl as a RequestExecutor on the oatpp's ApiClient
Build-Depends: curl,oatpp
Homepage: https://github.com/oatpp/oatpp-curl
10 changes: 2 additions & 8 deletions ports/oatpp-curl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,14 @@ vcpkg_from_github(
PATCHES "curl-submodule-no-pkg-config-in-vcpkg.patch"
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON")
else()
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF")
endif()

vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
"-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-curl-${OATPP_VERSION})
vcpkg_copy_pdbs()
Expand Down
1 change: 1 addition & 0 deletions ports/oatpp-libressl/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: oatpp-libressl
Version: 1.2.0
Port-Version: 1
Build-Depends: libressl, oatpp
Description: Oat++ libressl module providing secure server and client connection providers
Homepage: https://github.com/oatpp/oatpp-libressl
9 changes: 1 addition & 8 deletions ports/oatpp-libressl/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,13 @@ vcpkg_from_github(
PATCHES "libress-submodule-downgrade-required-libressl-version.patch"
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON")
else()
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF")
endif()

vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
"-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}"
"-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}"
"-DLIBRESSL_ROOT_DIR=${CURRENT_INSTALLED_DIR}"
)

vcpkg_install_cmake()
Expand Down
1 change: 1 addition & 0 deletions ports/oatpp-mbedtls/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: oatpp-mbedtls
Version: 1.2.0
Port-Version: 1
Build-Depends: mbedtls, oatpp
Description: Oat++ Mbed TLS submodule providing secure server and client connection providers
Homepage: https://github.com/oatpp/oatpp-mbedtls
10 changes: 2 additions & 8 deletions ports/oatpp-mbedtls/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,13 @@ vcpkg_from_github(
PATCHES find-mbedtls.patch
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON")
else()
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF")
endif()

vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}"
"-DOATPP_BUILD_TESTS:BOOL=OFF"
)

vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-mbedtls-${OATPP_VERSION})
vcpkg_copy_pdbs()
Expand Down
5 changes: 5 additions & 0 deletions ports/oatpp-sqlite/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Source: oatpp-sqlite
Version: 1.2.0
Description: OAT++ Modern web framework sqlite module
Build-Depends: oatpp,sqlite3
Homepage: https://github.com/oatpp/oatpp-sqlite
28 changes: 28 additions & 0 deletions ports/oatpp-sqlite/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
set(OATPP_VERSION "1.2.0")

vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO oatpp/oatpp-sqlite
REF 5128a4a1dc1f6ff5d0618237d1dbb9e9d5447e2f # 1.2.0
SHA512 d066701d4c857e895816db14c9700f321e171d2f990ee1c505c8b5243351d726db973d61ec7ebbe1b3f19e678627c41975aeac24fd2891d41900dfb25d427903
HEAD_REF master
)


NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
"-DOATPP_SQLITE_AMALGAMATION:BOOL=OFF"

NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
)
vcpkg_install_cmake()
vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/oatpp-sqlite-${OATPP_VERSION})
vcpkg_copy_pdbs()

file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
1 change: 1 addition & 0 deletions ports/oatpp-swagger/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: oatpp-swagger
Version: 1.2.0
Port-Version: 1
Description: Oat++ OpenApi (Swagger) UI submodule
Build-Depends: oatpp
Homepage: https://github.com/oatpp/oatpp-swagger
9 changes: 1 addition & 8 deletions ports/oatpp-swagger/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,12 @@ vcpkg_from_github(
HEAD_REF master
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON")
else()
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF")
endif()

vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
"-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
)

vcpkg_install_cmake()
Expand Down
1 change: 1 addition & 0 deletions ports/oatpp-websocket/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Source: oatpp-websocket
Version: 1.2.0
Port-Version: 1
Description: Oat++ websocket module
Build-Depends: oatpp
Homepage: https://github.com/oatpp/oatpp-websocket
9 changes: 1 addition & 8 deletions ports/oatpp-websocket/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,11 @@ vcpkg_from_github(
HEAD_REF master
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON")
else()
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF")
endif()

vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}"
"-DOATPP_BUILD_TESTS:BOOL=OFF"
)

vcpkg_install_cmake()
Expand Down
1 change: 1 addition & 0 deletions ports/oatpp/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Source: oatpp
Version: 1.2.0
Port-Version: 1
Description: Modern web framework
Homepage: https://github.com/oatpp/oatpp
13 changes: 3 additions & 10 deletions ports/oatpp/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,17 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO oatpp/oatpp
REF 2d8711307e23e9f022cbe2758c07ce4e44e8d31f # 1.2.0
SHA512 ae99467034360a4eb20a8a49e8ccd5e39ed9d71f9cd07d5b9bf2be0db7a7bff65415b0086de4ae267701c09f7b48fdf5d4d8ccb22f05fd41805232894b39b06c
REF 8f1c11ae534e1f03646de8efcc9b2505fb1881cc # 1.2.0
NancyLi1013 marked this conversation as resolved.
Show resolved Hide resolved
SHA512 4661aefe89be8153b08be0eb95ce688d5af3abd80e8f92fe3b2f1ac9dc76228383b05f7b33314de5f25d433013d6d287650ed156b69244b0d9ba8b604df8aaa3
HEAD_REF master
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "ON")
else()
set(OATPP_BUILD_SHARED_LIBRARIES_OPTION "OFF")
endif()

vcpkg_configure_cmake(
SOURCE_PATH "${SOURCE_PATH}"
PREFER_NINJA
OPTIONS
"-DOATPP_BUILD_TESTS:BOOL=OFF"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
"-DBUILD_SHARED_LIBS:BOOL=${OATPP_BUILD_SHARED_LIBRARIES_OPTION}"
"-DCMAKE_CXX_FLAGS=-D_CRT_SECURE_NO_WARNINGS"
)

vcpkg_install_cmake()
Expand Down