From b59d198396fe44d4efce5ec4826d66c2ac48f753 Mon Sep 17 00:00:00 2001 From: Marian Krivos Date: Sun, 8 Jan 2012 09:37:13 +0000 Subject: [PATCH] cmake build system cleanup --- Data/CMakeLists.txt | 98 ++++++++++++------------ Foundation/CMakeLists.txt | 2 +- NetSSL_OpenSSL/CMakeLists.txt | 57 +++++++------- Util/CMakeLists.txt | 129 ++++++++++++++++---------------- WebWidgets/CMakeLists.txt | 60 ++++++++------- WebWidgets/ExtJS/CMakeLists.txt | 4 +- XML/CMakeLists.txt | 56 +++++++------- Zip/CMakeLists.txt | 56 +++++++------- 8 files changed, 241 insertions(+), 221 deletions(-) diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt index c7856a773..d77c256ff 100644 --- a/Data/CMakeLists.txt +++ b/Data/CMakeLists.txt @@ -1,47 +1,51 @@ -set(LIBNAME "PocoData") - -set(SRCS "") -aux_source_directory(src SRCS) -include_directories( SQLite/include ) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation ) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -add_subdirectory( SQLite ) - -if(MYSQL_FOUND) - add_subdirectory( MySQL ) -endif(MYSQL_FOUND) - -include(../contrib/cmake/FindODBC.cmake) - -if(CMAKE_SYSTEM MATCHES "Windows") - message(STATUS "Windows native ODBC Support Enabled") - add_subdirectory( ODBC ) -else () - if ( ${UNIX_ODBC_CONFIG} STREQUAL UNIX_ODBC_CONFIG-NOTFOUND AND ${IODBC_CONFIG} STREQUAL IODBC_CONFIG-NOTFOUND) - message(STATUS "ODBC Support Disabled - no ODBC runtime") - else () - message(STATUS "ODBC Support Enabled") - add_subdirectory( ODBC ) - endif () -endif() - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () +set(LIBNAME "PocoData") + +set(SRCS "") +aux_source_directory(src SRCS) +include_directories( SQLite/include ) + +if (NOT POCO_STATIC) + add_definitions(-DData_EXPORTS -DTHREADSAFE -DODBC_EXPORTS -DMySQL_EXPORTS -DSQLite_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoFoundation ) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +add_subdirectory( SQLite ) + +if(MYSQL_FOUND) + add_subdirectory( MySQL ) +endif(MYSQL_FOUND) + +include(../contrib/cmake/FindODBC.cmake) + +if(CMAKE_SYSTEM MATCHES "Windows") + message(STATUS "Windows native ODBC Support Enabled") + add_subdirectory( ODBC ) +else () + if ( ${UNIX_ODBC_CONFIG} STREQUAL UNIX_ODBC_CONFIG-NOTFOUND AND ${IODBC_CONFIG} STREQUAL IODBC_CONFIG-NOTFOUND) + message(STATUS "ODBC Support Disabled - no ODBC runtime") + else () + message(STATUS "ODBC Support Enabled") + add_subdirectory( ODBC ) + endif () +endif() + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt index bf9723802..f1160a4ff 100644 --- a/Foundation/CMakeLists.txt +++ b/Foundation/CMakeLists.txt @@ -188,7 +188,7 @@ set(LIN_SRCS if(CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS} ${WIN_SRCS}) - add_definitions( -DPOCO_NO_FPENVIRONMENT -DPCRE_STATIC -DFoundation_EXPORTS) + add_definitions( -DPCRE_STATIC -DFoundation_EXPORTS) set(SYSLIBS ${SYSLIBS} iphlpapi) else (CMAKE_SYSTEM MATCHES "Windows") set(SRCS ${BASE_SRCS} ${LIN_SRCS}) diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt index fb5ff052e..438d8b043 100644 --- a/NetSSL_OpenSSL/CMakeLists.txt +++ b/NetSSL_OpenSSL/CMakeLists.txt @@ -1,26 +1,31 @@ -set(LIBNAME "PocoNetSSL") - -aux_source_directory(src SRCS) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} ssl crypto) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoNetSSL") + +aux_source_directory(src SRCS) +include_directories( ${OPENSSL_INCLUDE_DIR} ) + +if (NOT POCO_STATIC) + add_definitions(-DNetSSL_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} ssl crypto) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () + diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt index 3077421f4..37d3867a1 100644 --- a/Util/CMakeLists.txt +++ b/Util/CMakeLists.txt @@ -1,64 +1,65 @@ -set(LIBNAME "PocoUtil") - -set( BASE_SRCS -src/AbstractConfiguration.cpp -src/Application.cpp -src/ConfigurationMapper.cpp -src/ConfigurationView.cpp -src/FilesystemConfiguration.cpp -src/HelpFormatter.cpp -src/IniFileConfiguration.cpp -src/IntValidator.cpp -src/LayeredConfiguration.cpp -src/LoggingConfigurator.cpp -src/LoggingSubsystem.cpp -src/MapConfiguration.cpp -src/Option.cpp -src/OptionCallback.cpp -src/OptionException.cpp -src/OptionProcessor.cpp -src/OptionSet.cpp -src/PropertyFileConfiguration.cpp -src/RegExpValidator.cpp -src/ServerApplication.cpp -src/Subsystem.cpp -src/SystemConfiguration.cpp -src/Validator.cpp -src/XMLConfiguration.cpp -src/Timer.cpp -src/TimerTask.cpp -) - -set( WIN_SRCS -src/WinRegistryConfiguration.cpp -src/WinRegistryKey.cpp -src/WinService.cpp -) - -if(CMAKE_SYSTEM MATCHES "Windows") - set(SRCS ${BASE_SRCS} ${WIN_SRCS}) -else (CMAKE_SYSTEM MATCHES "Windows") - set(SRCS ${BASE_SRCS}) -endif(CMAKE_SYSTEM MATCHES "Windows") - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoXML PocoFoundation) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () +set(LIBNAME "PocoUtil") + +set( BASE_SRCS +src/AbstractConfiguration.cpp +src/Application.cpp +src/ConfigurationMapper.cpp +src/ConfigurationView.cpp +src/FilesystemConfiguration.cpp +src/HelpFormatter.cpp +src/IniFileConfiguration.cpp +src/IntValidator.cpp +src/LayeredConfiguration.cpp +src/LoggingConfigurator.cpp +src/LoggingSubsystem.cpp +src/MapConfiguration.cpp +src/Option.cpp +src/OptionCallback.cpp +src/OptionException.cpp +src/OptionProcessor.cpp +src/OptionSet.cpp +src/PropertyFileConfiguration.cpp +src/RegExpValidator.cpp +src/ServerApplication.cpp +src/Subsystem.cpp +src/SystemConfiguration.cpp +src/Validator.cpp +src/XMLConfiguration.cpp +src/Timer.cpp +src/TimerTask.cpp +) + +set( WIN_SRCS +src/WinRegistryConfiguration.cpp +src/WinRegistryKey.cpp +src/WinService.cpp +) + +if(CMAKE_SYSTEM MATCHES "Windows") + set(SRCS ${BASE_SRCS} ${WIN_SRCS}) + add_definitions(-DUtil_EXPORTS) +else (CMAKE_SYSTEM MATCHES "Windows") + set(SRCS ${BASE_SRCS}) +endif(CMAKE_SYSTEM MATCHES "Windows") + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoXML PocoFoundation) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () diff --git a/WebWidgets/CMakeLists.txt b/WebWidgets/CMakeLists.txt index 37098a8c9..30ec93c52 100644 --- a/WebWidgets/CMakeLists.txt +++ b/WebWidgets/CMakeLists.txt @@ -1,28 +1,32 @@ -set(LIBNAME "PocoWebWidgets") - -set(SRCS "") -aux_source_directory(src SRCS) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoNet PocoUtil PocoXML PocoFoundation ) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -add_subdirectory( ExtJS ) - -if (ENABLE_TESTS) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoWebWidgets") + +set(SRCS "") +aux_source_directory(src SRCS) + +if (NOT POCO_STATIC) + add_definitions(-DWebWidgets_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoNet PocoUtil PocoXML PocoFoundation ) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +add_subdirectory( ExtJS ) + +if (ENABLE_TESTS) + add_subdirectory(testsuite) +endif () + diff --git a/WebWidgets/ExtJS/CMakeLists.txt b/WebWidgets/ExtJS/CMakeLists.txt index 41709a449..20e9a20c6 100644 --- a/WebWidgets/ExtJS/CMakeLists.txt +++ b/WebWidgets/ExtJS/CMakeLists.txt @@ -5,7 +5,9 @@ include_directories( include src ) set(SRCS "") aux_source_directory(src SRCS) -add_definitions(-DSQLITE_OMIT_UTF16 -DSQLITE_OMIT_PROGRESS_CALLBACK -DSQLITE_OMIT_COMPLETE -DSQLITE_OMIT_TCL_VARIABLE) +if (NOT POCO_STATIC) + add_definitions(-DExtJS_EXPORTS) +endif (NOT POCO_STATIC) add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) set_target_properties( ${LIBNAME} diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt index 099b1b0da..049d3d298 100644 --- a/XML/CMakeLists.txt +++ b/XML/CMakeLists.txt @@ -1,28 +1,28 @@ -set(LIBNAME "PocoXML") - -aux_source_directory(src SRCS) - -add_definitions(-DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoFoundation) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoXML") + +aux_source_directory(src SRCS) + +add_definitions(-D_USRDLL -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H -DXML_EXPORTS) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoFoundation) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () + diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt index bd8e480d4..0cf3ce926 100644 --- a/Zip/CMakeLists.txt +++ b/Zip/CMakeLists.txt @@ -1,26 +1,30 @@ -set(LIBNAME "PocoZip") - -aux_source_directory(src SRCS) - -add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) -set_target_properties( ${LIBNAME} - PROPERTIES - VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) -target_link_libraries( ${LIBNAME} PocoUtil PocoXML PocoFoundation) - -install( - DIRECTORY include/Poco - DESTINATION include - PATTERN ".svn" EXCLUDE - ) - -install( - TARGETS ${LIBNAME} - DESTINATION lib - ) - -if (ENABLE_TESTS) - add_subdirectory(samples) - add_subdirectory(testsuite) -endif () - +set(LIBNAME "PocoZip") + +aux_source_directory(src SRCS) + +if (NOT POCO_STATIC) + add_definitions(-DZip_EXPORTS) +endif (NOT POCO_STATIC) + +add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} ) +set_target_properties( ${LIBNAME} + PROPERTIES + VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION} ) +target_link_libraries( ${LIBNAME} PocoUtil PocoXML PocoFoundation) + +install( + DIRECTORY include/Poco + DESTINATION include + PATTERN ".svn" EXCLUDE + ) + +install( + TARGETS ${LIBNAME} + DESTINATION lib + ) + +if (ENABLE_TESTS) + add_subdirectory(samples) + add_subdirectory(testsuite) +endif () +