diff options
| author | vvvv <vvvv@ydb.tech> | 2022-08-08 14:43:22 +0300 |
|---|---|---|
| committer | vvvv <vvvv@ydb.tech> | 2022-08-08 14:43:22 +0300 |
| commit | f5e8e19af3bc909fdb2e42501b3befcb9940f445 (patch) | |
| tree | a25aeef3a430071fcf64442925423cabace52548 /contrib/libs/expat | |
| parent | cd5f1d506209511017e977c7a7b53c4779d5adb1 (diff) | |
| download | ydb-f5e8e19af3bc909fdb2e42501b3befcb9940f445.tar.gz | |
fix darwin build
Diffstat (limited to 'contrib/libs/expat')
| -rw-r--r-- | contrib/libs/expat/CMakeLists.linux.txt | 23 | ||||
| -rw-r--r-- | contrib/libs/expat/CMakeLists.txt | 18 |
2 files changed, 15 insertions, 26 deletions
diff --git a/contrib/libs/expat/CMakeLists.linux.txt b/contrib/libs/expat/CMakeLists.linux.txt deleted file mode 100644 index ac9a9141da..0000000000 --- a/contrib/libs/expat/CMakeLists.linux.txt +++ /dev/null @@ -1,23 +0,0 @@ - -# This file was gererated by the build system used internally in the Yandex monorepo. -# Only simple modifications are allowed (adding source-files to targets, adding simple properties -# like target_include_directories). These modifications will be ported to original -# ya.make files by maintainers. Any complex modifications which can't be ported back to the -# original buildsystem will not be accepted. - - - -add_library(contrib-libs-expat) -target_compile_options(contrib-libs-expat PRIVATE - -DHAVE_EXPAT_CONFIG_H - -Wno-everything -) -target_include_directories(contrib-libs-expat PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/expat - ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib -) -target_sources(contrib-libs-expat PRIVATE - ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib/xmlparse.c - ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib/xmlrole.c - ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib/xmltok.c -) diff --git a/contrib/libs/expat/CMakeLists.txt b/contrib/libs/expat/CMakeLists.txt index e8c98bfd99..ac9a9141da 100644 --- a/contrib/libs/expat/CMakeLists.txt +++ b/contrib/libs/expat/CMakeLists.txt @@ -6,6 +6,18 @@ # original buildsystem will not be accepted. -if (UNIX AND NOT APPLE) - include(CMakeLists.linux.txt) -endif() + +add_library(contrib-libs-expat) +target_compile_options(contrib-libs-expat PRIVATE + -DHAVE_EXPAT_CONFIG_H + -Wno-everything +) +target_include_directories(contrib-libs-expat PRIVATE + ${CMAKE_SOURCE_DIR}/contrib/libs/expat + ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib +) +target_sources(contrib-libs-expat PRIVATE + ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib/xmlparse.c + ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib/xmlrole.c + ${CMAKE_SOURCE_DIR}/contrib/libs/expat/lib/xmltok.c +) |