Merge pull request #821 from Gamadril/poco-1.6.1

Fixed issue #705 Error building with ENABLE_UTIL=ON and ENABLE_XML=OFF
This commit is contained in:
Aleksandar Fabijanic 2015-05-19 18:21:38 -05:00
commit c5dca8e3ff

View File

@ -24,7 +24,18 @@ set_target_properties( "${LIBNAME}"
DEFINE_SYMBOL Util_EXPORTS
)
target_link_libraries( "${LIBNAME}" JSON XML Foundation)
target_link_libraries( "${LIBNAME}" Foundation)
if (ENABLE_XML)
target_link_libraries( "${LIBNAME}" XML)
else ()
add_definitions( -DPOCO_UTIL_NO_XMLCONFIGURATION )
endif()
if (ENABLE_JSON)
target_link_libraries( "${LIBNAME}" JSON)
else ()
add_definitions( -DPOCO_UTIL_NO_JSONCONFIGURATION )
endif()
target_include_directories( "${LIBNAME}"
PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>