mirror of
https://github.com/pocoproject/poco.git
synced 2025-04-01 17:25:03 +02:00
cmake fixes for JSON adding
This commit is contained in:
parent
a31370fa55
commit
a00602dd37
@ -3,6 +3,6 @@ set(SAMPLE_NAME "FormServer")
|
|||||||
set(LOCAL_SRCS "")
|
set(LOCAL_SRCS "")
|
||||||
aux_source_directory(src 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} )
|
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
||||||
target_link_libraries( ${SAMPLE_NAME} PocoNet PocoFoundation )
|
target_link_libraries( ${SAMPLE_NAME} PocoNet PocoFoundation )
|
||||||
|
@ -3,6 +3,6 @@ set(SAMPLE_NAME "TimeServer-apache")
|
|||||||
set(LOCAL_SRCS "")
|
set(LOCAL_SRCS "")
|
||||||
aux_source_directory(src 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} )
|
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
||||||
target_link_libraries( ${SAMPLE_NAME} PocoNet PocoFoundation )
|
target_link_libraries( ${SAMPLE_NAME} PocoNet PocoFoundation )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -3,6 +3,7 @@ set(LIBNAME "${LIBNAME}${LIB_EXT}")
|
|||||||
|
|
||||||
set( BASE_SRCS
|
set( BASE_SRCS
|
||||||
src/AbstractConfiguration.cpp
|
src/AbstractConfiguration.cpp
|
||||||
|
src/JSONConfiguration.cpp
|
||||||
src/Application.cpp
|
src/Application.cpp
|
||||||
src/ConfigurationMapper.cpp
|
src/ConfigurationMapper.cpp
|
||||||
src/ConfigurationView.cpp
|
src/ConfigurationView.cpp
|
||||||
@ -47,7 +48,7 @@ add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
|
|||||||
set_target_properties( ${LIBNAME}
|
set_target_properties( ${LIBNAME}
|
||||||
PROPERTIES
|
PROPERTIES
|
||||||
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} )
|
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(
|
install(
|
||||||
DIRECTORY include/Poco
|
DIRECTORY include/Poco
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -5,4 +5,4 @@ aux_source_directory(src LOCAL_SRCS)
|
|||||||
|
|
||||||
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
add_executable( ${SAMPLE_NAME} ${LOCAL_SRCS} )
|
||||||
#set_target_properties( ${SAMPLE_NAME} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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 )
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
set( TEST_SRCS
|
set( TEST_SRCS
|
||||||
src/AbstractConfigurationTest.cpp
|
src/AbstractConfigurationTest.cpp
|
||||||
|
src/JSONConfigurationTest.cpp
|
||||||
src/ConfigurationMapperTest.cpp
|
src/ConfigurationMapperTest.cpp
|
||||||
src/ConfigurationTestSuite.cpp
|
src/ConfigurationTestSuite.cpp
|
||||||
src/ConfigurationViewTest.cpp
|
src/ConfigurationViewTest.cpp
|
||||||
@ -34,4 +35,4 @@ set(TESTUNIT "${LIBNAME}-testrunner")
|
|||||||
|
|
||||||
add_executable( ${TESTUNIT} ${TEST_SRCS} )
|
add_executable( ${TESTUNIT} ${TEST_SRCS} )
|
||||||
#set_target_properties( ${TESTUNIT} PROPERTIES COMPILE_FLAGS ${RELEASE_CXX_FLAGS} )
|
#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)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user