diff options
| author | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-03-18 22:25:17 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-18 22:25:17 -0700 |
| commit | 44b9e5f98b41225ad9327d5c248e4a754cdddd9c (patch) | |
| tree | e273e5d488d96de8c80c40165d37a8c3bad992a8 | |
| parent | 02511898db381da2f643bc4d4e55fc9bca00214d (diff) | |
| parent | 563e085d424fc7b45c5f9e5897ef470b5c1186d8 (diff) | |
| download | vcpkg-44b9e5f98b41225ad9327d5c248e4a754cdddd9c.tar.gz vcpkg-44b9e5f98b41225ad9327d5c248e4a754cdddd9c.zip | |
Merge pull request #5692 from BigSeb/fix-sqlpp11
Fix sqlpp11 warnings
| -rw-r--r-- | ports/sqlpp11-connector-mysql/CONTROL | 4 | ||||
| -rw-r--r-- | ports/sqlpp11-connector-mysql/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/sqlpp11-connector-sqlite3/CONTROL | 4 | ||||
| -rw-r--r-- | ports/sqlpp11-connector-sqlite3/portfile.cmake | 2 | ||||
| -rw-r--r-- | ports/sqlpp11/CONTROL | 4 | ||||
| -rw-r--r-- | ports/sqlpp11/portfile.cmake | 4 |
6 files changed, 14 insertions, 6 deletions
diff --git a/ports/sqlpp11-connector-mysql/CONTROL b/ports/sqlpp11-connector-mysql/CONTROL index 690e9d1ab..e56275137 100644 --- a/ports/sqlpp11-connector-mysql/CONTROL +++ b/ports/sqlpp11-connector-mysql/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11-connector-mysql
-Version: 0.25
+Version: 0.25-1
Description: A C++ wrapper for MySQL meant to be used in combination with sqlpp11.
-Build-Depends: date, libmariadb, sqlpp11
\ No newline at end of file +Build-Depends: date, libmariadb, sqlpp11
diff --git a/ports/sqlpp11-connector-mysql/portfile.cmake b/ports/sqlpp11-connector-mysql/portfile.cmake index 37b8ca147..fbaaebaf1 100644 --- a/ports/sqlpp11-connector-mysql/portfile.cmake +++ b/ports/sqlpp11-connector-mysql/portfile.cmake @@ -22,5 +22,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-mysql RENAME copyright)
diff --git a/ports/sqlpp11-connector-sqlite3/CONTROL b/ports/sqlpp11-connector-sqlite3/CONTROL index 35a65250b..25e680eda 100644 --- a/ports/sqlpp11-connector-sqlite3/CONTROL +++ b/ports/sqlpp11-connector-sqlite3/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11-connector-sqlite3
-Version: 0.29
+Version: 0.29-1
Description: A C++ wrapper for sqlite3 meant to be used in combination with sqlpp11.
-Build-Depends: date, sqlite3, sqlpp11
\ No newline at end of file +Build-Depends: date, sqlite3, sqlpp11
diff --git a/ports/sqlpp11-connector-sqlite3/portfile.cmake b/ports/sqlpp11-connector-sqlite3/portfile.cmake index 6937abff2..735912a86 100644 --- a/ports/sqlpp11-connector-sqlite3/portfile.cmake +++ b/ports/sqlpp11-connector-sqlite3/portfile.cmake @@ -20,5 +20,7 @@ vcpkg_configure_cmake( vcpkg_install_cmake()
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
+
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11-connector-sqlite3 RENAME copyright)
diff --git a/ports/sqlpp11/CONTROL b/ports/sqlpp11/CONTROL index 7c75d17d9..bd5101f8f 100644 --- a/ports/sqlpp11/CONTROL +++ b/ports/sqlpp11/CONTROL @@ -1,4 +1,4 @@ Source: sqlpp11
-Version: 0.57
+Version: 0.57-1
Description: A type safe embedded domain specific language for SQL queries and results in C++.
-Build-Depends: date
\ No newline at end of file +Build-Depends: date
diff --git a/ports/sqlpp11/portfile.cmake b/ports/sqlpp11/portfile.cmake index 61b930da5..be99572e3 100644 --- a/ports/sqlpp11/portfile.cmake +++ b/ports/sqlpp11/portfile.cmake @@ -24,5 +24,9 @@ vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake) # Delete redundant and unnecessary directories
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug ${CURRENT_PACKAGES_DIR}/lib)
+# Move python script from bin directory
+file(COPY ${CURRENT_PACKAGES_DIR}/bin/sqlpp11-ddl2cpp DESTINATION ${CURRENT_PACKAGES_DIR}/scripts)
+file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin/)
+
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/sqlpp11 RENAME copyright)
|