generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-28 03:20:11 +01:00
Code Issues Projects Releases Wiki Activity

related to GH#705: Error building with ENABLE_UTIL=ON and ENABLE_XML=OFF

Browse Source
This commit is contained in:
Alex Fabijanic
2015-02-02 00:00:26 -06:00
parent 120cbdc64a
commit 74c24a3789
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Util/Makefile
View File

@@ -13,9 +13,9 @@ objects = AbstractConfiguration Application ConfigurationMapper \
LoggingConfigurator LoggingSubsystem MapConfiguration \ LoggingConfigurator LoggingSubsystem MapConfiguration \
Option OptionException OptionProcessor OptionSet \ Option OptionException OptionProcessor OptionSet \
PropertyFileConfiguration Subsystem SystemConfiguration \ PropertyFileConfiguration Subsystem SystemConfiguration \
XMLConfiguration FilesystemConfiguration ServerApplication \ FilesystemConfiguration ServerApplication \
Validator IntValidator RegExpValidator OptionCallback \ Validator IntValidator RegExpValidator OptionCallback \
Timer TimerTask JSONConfiguration Timer TimerTask
ifeq ($(findstring MinGW, $(POCO_CONFIG)), MinGW) ifeq ($(findstring MinGW, $(POCO_CONFIG)), MinGW)
objects += WinService WinRegistryKey WinRegistryConfiguration objects += WinService WinRegistryKey WinRegistryConfiguration
@@ -23,6 +23,16 @@ endif
target = PocoUtil target = PocoUtil
target_version = $(LIBVERSION) target_version = $(LIBVERSION)
target_libs = PocoFoundation PocoXML PocoJSON target_libs = PocoFoundation
ifndef POCO_UTIL_NO_XMLCONFIGURATION
objects += XMLConfiguration
target_libs += PocoXML
endif
ifndef POCO_UTIL_NO_JSONCONFIGURATION
objects += JSONConfiguration
target_libs += PocoJSON
endif
include $(POCO_BASE)/build/rules/lib include $(POCO_BASE)/build/rules/lib

4
Util/src/Application.cpp
View File

@@ -19,8 +19,12 @@
#include "Poco/Util/MapConfiguration.h" #include "Poco/Util/MapConfiguration.h"
#include "Poco/Util/PropertyFileConfiguration.h" #include "Poco/Util/PropertyFileConfiguration.h"
#include "Poco/Util/IniFileConfiguration.h" #include "Poco/Util/IniFileConfiguration.h"
#ifndef POCO_UTIL_NO_XMLCONFIGURATION
#include "Poco/Util/XMLConfiguration.h" #include "Poco/Util/XMLConfiguration.h"
#endif
#ifndef POCO_UTIL_NO_JSONCONFIGURATION
#include "Poco/Util/JSONConfiguration.h" #include "Poco/Util/JSONConfiguration.h"
#endif
#include "Poco/Util/LoggingSubsystem.h" #include "Poco/Util/LoggingSubsystem.h"
#include "Poco/Util/Option.h" #include "Poco/Util/Option.h"
#include "Poco/Util/OptionProcessor.h" #include "Poco/Util/OptionProcessor.h"