From a00602dd37727ded92eba7e78fdef1af403bff0f Mon Sep 17 00:00:00 2001 From: Marian Krivos Date: Tue, 31 Jul 2012 06:44:40 +0000 Subject: [PATCH] cmake fixes for JSON adding --- ApacheConnector/samples/FormServer/CMakeLists.txt | 2 +- ApacheConnector/samples/TimeServer/CMakeLists.txt | 2 +- Net/samples/EchoServer/CMakeLists.txt | 2 +- Net/samples/HTTPFormServer/CMakeLists.txt | 2 +- Net/samples/HTTPLoadTest/CMakeLists.txt | 2 +- Net/samples/HTTPTimeServer/CMakeLists.txt | 2 +- Net/samples/Mail/CMakeLists.txt | 2 +- Net/samples/Ping/CMakeLists.txt | 2 +- Net/samples/SMTPLogger/CMakeLists.txt | 2 +- Net/samples/TimeServer/CMakeLists.txt | 2 +- Net/samples/TwitterClient/CMakeLists.txt | 2 +- Net/samples/WebSocketServer/CMakeLists.txt | 2 +- Net/samples/dict/CMakeLists.txt | 2 +- Net/samples/download/CMakeLists.txt | 2 +- Net/samples/httpget/CMakeLists.txt | 2 +- Util/CMakeLists.txt | 3 ++- Util/samples/SampleApp/CMakeLists.txt | 2 +- Util/samples/SampleServer/CMakeLists.txt | 2 +- Util/samples/Units/CMakeLists.txt | 2 +- Util/samples/pkill/CMakeLists.txt | 2 +- Util/testsuite/CMakeLists.txt | 3 ++- 21 files changed, 23 insertions(+), 21 deletions(-) diff --git a/ApacheConnector/samples/FormServer/CMakeLists.txt b/ApacheConnector/samples/FormServer/CMakeLists.txt index a679c8971..72179c4ec 100644 --- a/ApacheConnector/samples/FormServer/CMakeLists.txt +++ b/ApacheConnector/samples/FormServer/CMakeLists.txt @@ -3,6 +3,6 @@ set(SAMPLE_NAME "FormServer") set(LOCAL_SRCS "") aux_source_directory(src LOCAL_SRCS) -add_library( ${SAMPLE_NAME} SHARED ${LOCAL_SRCS} ) +add_library( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) target_link_libraries( ${SAMPLE_NAME} PocoNet PocoFoundation ) diff --git a/ApacheConnector/samples/TimeServer/CMakeLists.txt b/ApacheConnector/samples/TimeServer/CMakeLists.txt index 154b78f2f..82b302372 100644 --- a/ApacheConnector/samples/TimeServer/CMakeLists.txt +++ b/ApacheConnector/samples/TimeServer/CMakeLists.txt @@ -3,6 +3,6 @@ set(SAMPLE_NAME "TimeServer-apache") set(LOCAL_SRCS "") aux_source_directory(src LOCAL_SRCS) -add_library( ${SAMPLE_NAME} SHARED ${LOCAL_SRCS} ) +add_library( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) target_link_libraries( ${SAMPLE_NAME} PocoNet PocoFoundation ) diff --git a/Net/samples/EchoServer/CMakeLists.txt b/Net/samples/EchoServer/CMakeLists.txt index e2c36a538..3c80e944b 100644 --- a/Net/samples/EchoServer/CMakeLists.txt +++ b/Net/samples/EchoServer/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/HTTPFormServer/CMakeLists.txt b/Net/samples/HTTPFormServer/CMakeLists.txt index 653bdcaa9..3aa08e298 100644 --- a/Net/samples/HTTPFormServer/CMakeLists.txt +++ b/Net/samples/HTTPFormServer/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/HTTPLoadTest/CMakeLists.txt b/Net/samples/HTTPLoadTest/CMakeLists.txt index 73c950036..14adeaead 100644 --- a/Net/samples/HTTPLoadTest/CMakeLists.txt +++ b/Net/samples/HTTPLoadTest/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/HTTPTimeServer/CMakeLists.txt b/Net/samples/HTTPTimeServer/CMakeLists.txt index 0aa85eec6..7cf0b0ac7 100644 --- a/Net/samples/HTTPTimeServer/CMakeLists.txt +++ b/Net/samples/HTTPTimeServer/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/Mail/CMakeLists.txt b/Net/samples/Mail/CMakeLists.txt index d4a8c9a61..1f9741e49 100644 --- a/Net/samples/Mail/CMakeLists.txt +++ b/Net/samples/Mail/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/Ping/CMakeLists.txt b/Net/samples/Ping/CMakeLists.txt index 5bfabe007..0e187157e 100644 --- a/Net/samples/Ping/CMakeLists.txt +++ b/Net/samples/Ping/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/SMTPLogger/CMakeLists.txt b/Net/samples/SMTPLogger/CMakeLists.txt index dd4a46001..a805d2812 100644 --- a/Net/samples/SMTPLogger/CMakeLists.txt +++ b/Net/samples/SMTPLogger/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/TimeServer/CMakeLists.txt b/Net/samples/TimeServer/CMakeLists.txt index 11d9b7c6a..138f10026 100644 --- a/Net/samples/TimeServer/CMakeLists.txt +++ b/Net/samples/TimeServer/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/TwitterClient/CMakeLists.txt b/Net/samples/TwitterClient/CMakeLists.txt index 417f5f15d..0fd01621a 100644 --- a/Net/samples/TwitterClient/CMakeLists.txt +++ b/Net/samples/TwitterClient/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/WebSocketServer/CMakeLists.txt b/Net/samples/WebSocketServer/CMakeLists.txt index cdccf9ef2..e09622015 100644 --- a/Net/samples/WebSocketServer/CMakeLists.txt +++ b/Net/samples/WebSocketServer/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/dict/CMakeLists.txt b/Net/samples/dict/CMakeLists.txt index d16030df5..b3245565f 100644 --- a/Net/samples/dict/CMakeLists.txt +++ b/Net/samples/dict/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/download/CMakeLists.txt b/Net/samples/download/CMakeLists.txt index 6752af650..38b0b9661 100644 --- a/Net/samples/download/CMakeLists.txt +++ b/Net/samples/download/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Net/samples/httpget/CMakeLists.txt b/Net/samples/httpget/CMakeLists.txt index 976530e89..cada674e5 100644 --- a/Net/samples/httpget/CMakeLists.txt +++ b/Net/samples/httpget/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoNet PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt index 1d00ae9ce..7074fb7dc 100644 --- a/Util/CMakeLists.txt +++ b/Util/CMakeLists.txt @@ -3,6 +3,7 @@ set(LIBNAME "${LIBNAME}${LIB_EXT}") set( BASE_SRCS src/AbstractConfiguration.cpp +src/JSONConfiguration.cpp src/Application.cpp src/ConfigurationMapper.cpp src/ConfigurationView.cpp @@ -47,7 +48,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} PROPERTIES VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) +target_link_libraries( ${LIBNAME} PocoJSON${LIB_EXT} PocoXML${LIB_EXT} PocoFoundation${LIB_EXT}) install( DIRECTORY include/Poco diff --git a/Util/samples/SampleApp/CMakeLists.txt b/Util/samples/SampleApp/CMakeLists.txt index a64def282..605979dbf 100644 --- a/Util/samples/SampleApp/CMakeLists.txt +++ b/Util/samples/SampleApp/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Util/samples/SampleServer/CMakeLists.txt b/Util/samples/SampleServer/CMakeLists.txt index 82d5a3189..b78b60489 100644 --- a/Util/samples/SampleServer/CMakeLists.txt +++ b/Util/samples/SampleServer/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Util/samples/Units/CMakeLists.txt b/Util/samples/Units/CMakeLists.txt index 49a5e9e10..7aa07e55a 100644 --- a/Util/samples/Units/CMakeLists.txt +++ b/Util/samples/Units/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Util/samples/pkill/CMakeLists.txt b/Util/samples/pkill/CMakeLists.txt index 01a245170..7312ab663 100644 --- a/Util/samples/pkill/CMakeLists.txt +++ b/Util/samples/pkill/CMakeLists.txt @@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS) add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} ) #set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoXML PocoFoundation ) +target_link_libraries( ${SAMPLE_NAME} PocoUtil PocoJSON PocoXML PocoFoundation ) diff --git a/Util/testsuite/CMakeLists.txt b/Util/testsuite/CMakeLists.txt index ec0dcd925..b621775af 100644 --- a/Util/testsuite/CMakeLists.txt +++ b/Util/testsuite/CMakeLists.txt @@ -1,5 +1,6 @@ set( TEST_SRCS src/AbstractConfigurationTest.cpp +src/JSONConfigurationTest.cpp src/ConfigurationMapperTest.cpp src/ConfigurationTestSuite.cpp src/ConfigurationViewTest.cpp @@ -34,4 +35,4 @@ set(TESTUNIT "${LIBNAME}-testrunner") add_executable( ${TESTUNIT} ${TEST_SRCS} ) #set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} ) -target_link_libraries( ${TESTUNIT} PocoUtil PocoXML PocoFoundation CppUnit) +target_link_libraries( ${TESTUNIT} PocoUtil PocoJSON PocoXML PocoFoundation CppUnit)