X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/02b5dcd27ece461f9dbe122771c4b740dd909d67..6e6de2ae8f5f661500c565aca8c36277e860b834:/libs/CMakeLists.txt diff --git a/libs/CMakeLists.txt b/libs/CMakeLists.txt index 17b90799..bc632f03 100644 --- a/libs/CMakeLists.txt +++ b/libs/CMakeLists.txt @@ -34,13 +34,6 @@ if ( BUILD_LIB_IBPP ) target_compile_options ( ibpp PRIVATE -Wno-old-style-cast $<$:-Wno-useless-cast> ) endif ( BUILD_LIB_IBPP ) -if ( BUILD_LIB_JSON ) - find_package ( YAJL REQUIRED ) - add_library ( json STATIC json/generator.cpp json/parser.cpp ) - target_include_directories ( json PUBLIC json/include ) - target_link_libraries ( json common YAJL::YAJL ) -endif ( BUILD_LIB_JSON ) - if ( BUILD_LIB_LOGGER ) add_library ( logger STATIC logger/logger.cpp ) target_include_directories ( logger PUBLIC logger/include ) @@ -64,8 +57,9 @@ if ( BUILD_LIB_SMUX ) endif ( BUILD_LIB_SMUX ) if ( BUILD_LIB_SRVCONF ) + find_package ( EXPAT REQUIRED ) file ( GLOB PARSERS srvconf/parsers/*.cpp ) add_library ( srvconf STATIC srvconf/servconf.cpp srvconf/netunit.cpp ${PARSERS} ) target_include_directories ( srvconf PUBLIC srvconf/include ) - target_link_libraries ( srvconf crypto common ) + target_link_libraries ( srvconf crypto common EXPAT::EXPAT ) endif ( BUILD_LIB_SRVCONF )