[oatpp-sqlite] port added (#14107)

microsoft · Oct 30, 2020 · d89bfc3 · d89bfc3
1 parent f543049
commit d89bfc3
Show file tree

Hide file tree

Showing 16 changed files with 50 additions and 58 deletions.
diff --git a/ports/oatpp-consul/CONTROL b/ports/oatpp-consul/CONTROL
@@ -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
diff --git a/ports/oatpp-consul/portfile.cmake b/ports/oatpp-consul/portfile.cmake
@@ -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()

diff --git a/ports/oatpp-curl/CONTROL b/ports/oatpp-curl/CONTROL
@@ -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
diff --git a/ports/oatpp-curl/portfile.cmake b/ports/oatpp-curl/portfile.cmake
@@ -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()

diff --git a/ports/oatpp-libressl/CONTROL b/ports/oatpp-libressl/CONTROL
@@ -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
diff --git a/ports/oatpp-libressl/portfile.cmake b/ports/oatpp-libressl/portfile.cmake
@@ -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()

diff --git a/ports/oatpp-mbedtls/CONTROL b/ports/oatpp-mbedtls/CONTROL
@@ -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
diff --git a/ports/oatpp-mbedtls/portfile.cmake b/ports/oatpp-mbedtls/portfile.cmake
@@ -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()

diff --git a/ports/oatpp-sqlite/CONTROL b/ports/oatpp-sqlite/CONTROL
@@ -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
diff --git a/ports/oatpp-sqlite/portfile.cmake b/ports/oatpp-sqlite/portfile.cmake
@@ -0,0 +1,26 @@
+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
+)
+
+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"
+)
+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)
diff --git a/ports/oatpp-swagger/CONTROL b/ports/oatpp-swagger/CONTROL
@@ -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
diff --git a/ports/oatpp-swagger/portfile.cmake b/ports/oatpp-swagger/portfile.cmake
@@ -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()

diff --git a/ports/oatpp-websocket/CONTROL b/ports/oatpp-websocket/CONTROL
@@ -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
diff --git a/ports/oatpp-websocket/portfile.cmake b/ports/oatpp-websocket/portfile.cmake
@@ -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()

diff --git a/ports/oatpp/CONTROL b/ports/oatpp/CONTROL
@@ -1,4 +1,5 @@
 Source: oatpp
 Version: 1.2.0
+Port-Version: 1
 Description: Modern web framework
 Homepage: https://github.com/oatpp/oatpp
diff --git a/ports/oatpp/portfile.cmake b/ports/oatpp/portfile.cmake
@@ -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
+    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()