forked from microsoft/vcpkg
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[sqlpp11,vcpkg-ci-sqlpp11] Fixes, cleanup, test port (microsoft#41128)
- Loading branch information
Showing
12 changed files
with
135 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,26 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index bb05cd8..4e83094 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -113,7 +113,7 @@ endif() | ||
| ### Packaging | ||
| install(PROGRAMS ${PROJECT_SOURCE_DIR}/scripts/ddl2cpp | ||
| RENAME sqlpp11-ddl2cpp | ||
| - DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| + DESTINATION tools/sqlpp11 | ||
| ) | ||
|
|
||
| write_basic_package_version_file(Sqlpp11ConfigVersion.cmake | ||
| diff --git a/cmake/configs/Sqlpp11Config.cmake b/cmake/configs/Sqlpp11Config.cmake | ||
| index 5c5926f..c25da97 100644 | ||
| index bf340d6..249014d 100644 | ||
| --- a/cmake/configs/Sqlpp11Config.cmake | ||
| +++ b/cmake/configs/Sqlpp11Config.cmake | ||
| @@ -55,7 +55,7 @@ endforeach() | ||
|
|
||
| # Import "ddl2cpp" script | ||
| if(NOT TARGET sqlpp11::ddl2cpp) | ||
| - get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH) | ||
| + get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../scripts/sqlpp11-ddl2cpp" REALPATH) | ||
| if(NOT EXISTS "${sqlpp11_ddl2cpp_location}") | ||
| message(FATAL_ERROR "The imported target sqlpp11::ddl2cpp references the file '${sqlpp11_ddl2cpp_location}' but this file does not exists.") | ||
| endif() | ||
| - get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../../bin/sqlpp11-ddl2cpp" REALPATH) | ||
| + get_filename_component(sqlpp11_ddl2cpp_location "${CMAKE_CURRENT_LIST_DIR}/../../tools/sqlpp11/sqlpp11-ddl2cpp" REALPATH) | ||
| if(NOT EXISTS "${sqlpp11_ddl2cpp_location}") | ||
| message(FATAL_ERROR "The imported target sqlpp11::ddl2cpp references the file '${sqlpp11_ddl2cpp_location}' but this file does not exists.") | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
| index bb05cd8..6aff88b 100644 | ||
| --- a/CMakeLists.txt | ||
| +++ b/CMakeLists.txt | ||
| @@ -51,7 +51,8 @@ set(SQLPP11_INSTALL_CMAKEDIR ${CMAKE_INSTALL_LIBDIR}/cmake/Sqlpp11 CACHE STRING | ||
|
|
||
| ### Dependencies | ||
| if(DEPENDENCY_CHECK AND BUILD_MYSQL_CONNECTOR) | ||
| - find_package(MySQL REQUIRED) | ||
| + find_package(MySQL NAMES unofficial-libmysql REQUIRED) | ||
| + add_library(MySQL::MySQL ALIAS unofficial::libmysql::libmysql) | ||
| endif() | ||
|
|
||
| if(DEPENDENCY_CHECK AND BUILD_MARIADB_CONNECTOR) | ||
| diff --git a/cmake/configs/Sqlpp11MySQLConfig.cmake b/cmake/configs/Sqlpp11MySQLConfig.cmake | ||
| index 0d2a5b3..53dab6e 100644 | ||
| --- a/cmake/configs/Sqlpp11MySQLConfig.cmake | ||
| +++ b/cmake/configs/Sqlpp11MySQLConfig.cmake | ||
| @@ -1,2 +1,2 @@ | ||
| include(CMakeFindDependencyMacro) | ||
| -find_dependency(MySQL) | ||
| \ No newline at end of file | ||
| +find_dependency(unofficial-libmysql) |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| set(VCPKG_POLICY_EMPTY_PACKAGE enabled) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| { | ||
| "name": "sqlpp11-connector-mysql", | ||
| "version-string": "ci", | ||
| "description": "Overlay for an obsolete empty port in order to unblock sqlpp11 testing: platform-specific choice of testable implementation", | ||
| "homepage": "https://github.com/microsoft/vcpkg", | ||
| "license": "MIT", | ||
| "supports": "!uwp", | ||
| "dependencies": [ | ||
| { | ||
| "name": "sqlpp11", | ||
| "default-features": false, | ||
| "features": [ | ||
| "mariadb" | ||
| ], | ||
| "platform": "x86 & windows" | ||
| }, | ||
| { | ||
| "name": "sqlpp11", | ||
| "default-features": false, | ||
| "features": [ | ||
| "mysql" | ||
| ], | ||
| "platform": "!(x86 & windows)" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| set(VCPKG_POLICY_EMPTY_PACKAGE enabled) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,36 @@ | ||
| { | ||
| "name": "vcpkg-ci-sqlpp11", | ||
| "version-string": "ci", | ||
| "description": "Port to force features of sqlpp11 within CI", | ||
| "homepage": "https://github.com/microsoft/vcpkg", | ||
| "license": "MIT", | ||
| "dependencies": [ | ||
| { | ||
| "name": "sqlpp11", | ||
| "features": [ | ||
| "sqlite3" | ||
| ] | ||
| }, | ||
| { | ||
| "name": "sqlpp11", | ||
| "features": [ | ||
| "postgresql" | ||
| ], | ||
| "platform": "!uwp" | ||
| }, | ||
| { | ||
| "name": "sqlpp11", | ||
| "features": [ | ||
| "mariadb" | ||
| ], | ||
| "platform": "x86 & windows" | ||
| }, | ||
| { | ||
| "name": "sqlpp11", | ||
| "features": [ | ||
| "mysql" | ||
| ], | ||
| "platform": "!android & !uwp & !(x86 & windows)" | ||
| } | ||
| ] | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters