aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs/expat
diff options
context:
space:
mode:
authorhrustyashko <hrustyashko@yandex-team.ru>2022-04-07 10:47:49 +0300
committerhrustyashko <hrustyashko@yandex-team.ru>2022-04-07 10:47:49 +0300
commit18dcbc27f5d6c6d5a79cc85d30587dc2f14485cd (patch)
tree2f5f0cadb5822f8c712e961b0933722157f7e51e /contrib/libs/expat
parentfcb0844ab2c3ff96971288ec2d7b024051eb1658 (diff)
downloadydb-18dcbc27f5d6c6d5a79cc85d30587dc2f14485cd.tar.gz
YQ-1003 ExternalFunction provider
store connection name at resolved function rename expr nodes to dq_function dq function data provider ref:23fa1160965eb31574ae1c31a5a9152781f238c2
Diffstat (limited to 'contrib/libs/expat')
-rw-r--r--contrib/libs/expat/CMakeLists.linux.txt22
-rw-r--r--contrib/libs/expat/CMakeLists.txt17
2 files changed, 14 insertions, 25 deletions
diff --git a/contrib/libs/expat/CMakeLists.linux.txt b/contrib/libs/expat/CMakeLists.linux.txt
deleted file mode 100644
index 242054b589..0000000000
--- a/contrib/libs/expat/CMakeLists.linux.txt
+++ /dev/null
@@ -1,22 +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
-)
-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 c031ddb850..242054b589 100644
--- a/contrib/libs/expat/CMakeLists.txt
+++ b/contrib/libs/expat/CMakeLists.txt
@@ -6,6 +6,17 @@
# original buildsystem will not be accepted.
-if (UNIX)
- include(CMakeLists.linux.txt)
-endif()
+
+add_library(contrib-libs-expat)
+target_compile_options(contrib-libs-expat PRIVATE
+ -DHAVE_EXPAT_CONFIG_H
+)
+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
+)