Skip to content

Commit

Permalink
Fix
Browse files Browse the repository at this point in the history
  • Loading branch information
alesapin committed Aug 23, 2024
1 parent ba4b91c commit f704a18
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
9 changes: 3 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ option (CH_ODBC_PREFER_BUNDLED_THIRD_PARTIES "Prefer bundled over system variant
cmake_dependent_option (CH_ODBC_PREFER_BUNDLED_POCO "Prefer bundled over system variants of Poco library" ON "CH_ODBC_PREFER_BUNDLED_THIRD_PARTIES" OFF)
cmake_dependent_option (CH_ODBC_PREFER_BUNDLED_SSL "Prefer bundled over system variants of SSL library" ON "CH_ODBC_PREFER_BUNDLED_POCO" OFF)
cmake_dependent_option (CH_ODBC_PREFER_BUNDLED_FOLLY "Prefer bundled over system variants of Folly library" ON "CH_ODBC_PREFER_BUNDLED_THIRD_PARTIES" OFF)
cmake_dependent_option (CH_ODBC_PREFER_BUNDLED_ICU "Prefer bundled over system variants of ICU library" OFF "CH_ODBC_PREFER_BUNDLED_THIRD_PARTIES" OFF)
cmake_dependent_option (CH_ODBC_PREFER_BUNDLED_ICU "Prefer bundled over system variants of ICU library" ON "CH_ODBC_PREFER_BUNDLED_THIRD_PARTIES" OFF)
cmake_dependent_option (CH_ODBC_PREFER_BUNDLED_GOOGLETEST "Prefer bundled over system variants of Google Test library" ON "CH_ODBC_PREFER_BUNDLED_THIRD_PARTIES" OFF)
cmake_dependent_option (CH_ODBC_PREFER_BUNDLED_NANODBC "Prefer bundled over system variants of nanodbc library" ON "CH_ODBC_PREFER_BUNDLED_THIRD_PARTIES" OFF)
option (CH_ODBC_RUNTIME_LINK_STATIC "Link with compiler and language runtime statically" OFF)
Expand Down Expand Up @@ -145,11 +145,8 @@ if (NOT CH_ODBC_PREFER_BUNDLED_FOLLY)
# find_package (Folly)
endif ()

if (CH_ODBC_USE_ICU)
if (CH_ODBC_PREFER_BUNDLED_ICU)
message (WARNING "ICU: using bundled variant of the library currently not supported")
endif ()
find_package (ICU COMPONENTS uc REQUIRED)
if (NOT CH_ODBC_USE_ICU)
message (WARNING "Not using ICU")
endif ()

if (CH_ODBC_ENABLE_TESTING)
Expand Down
2 changes: 1 addition & 1 deletion contrib/icu
Submodule icu updated 9421 files
6 changes: 5 additions & 1 deletion driver/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,12 @@ function (declare_odbc_test_targets libname UNICODE)
)

if (CH_ODBC_USE_ICU)
target_include_directories (${libname}-client-it
PUBLIC ch_contrib::icu
)

target_link_libraries (${libname}-client-it
PRIVATE ICU::uc
PUBLIC ch_contrib::icu
)
endif ()

Expand Down

0 comments on commit f704a18

Please sign in to comment.