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

[nanodbc] fix build #34112

Merged
merged 1 commit into from
Oct 3, 2023
Merged

[nanodbc] fix build #34112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions ports/nanodbc/no-werror.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1ce7232..57836fe 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,7 @@ set(CMAKE_CXX_EXTENSIONS OFF)
message(STATUS "nanodbc compile: C++${CMAKE_CXX_STANDARD}")

if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_COMPILER_IS_GNUCXX)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
include(CheckCXXCompilerFlag)

if (NANODBC_ENABLE_COVERAGE)
1 change: 1 addition & 0 deletions ports/nanodbc/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ vcpkg_from_github(
rename-version.patch
add-missing-include.patch
find-unixodbc.patch
no-werror.patch
)
file(RENAME "${SOURCE_PATH}/VERSION" "${SOURCE_PATH}/VERSION.txt")

Expand Down
2 changes: 1 addition & 1 deletion ports/nanodbc/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "nanodbc",
"version": "2.13.0",
"port-version": 6,
"port-version": 7,
"description": "A small C++ wrapper for the native C ODBC API.",
"homepage": "https://github.com/nanodbc/nanodbc",
"dependencies": [
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5670,7 +5670,7 @@
},
"nanodbc": {
"baseline": "2.13.0",
"port-version": 6
"port-version": 7
},
"nanoflann": {
"baseline": "1.5.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/n-/nanodbc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b57473b86bc71733209e195206d253f1dd3658b2",
"version": "2.13.0",
"port-version": 7
},
{
"git-tree": "7de6296fc337f181517f8ed4c2e6ed35d749e414",
"version": "2.13.0",
Expand Down