generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-08 12:36:43 +02:00
Code Issues Projects Releases Wiki Activity

Fix path to DLLVersion.rc and enable to skip Foundation; Fix Foundation samples referencing useless libs

Browse Source
This commit is contained in:
Brice Gros
2019-10-18 15:35:02 +02:00
parent d658cc25e7
commit 990f7825b5
25 changed files with 60 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -175,6 +175,7 @@ else()
endif() endif()
# Allow enabling and disabling components # Allow enabling and disabling components
option(ENABLE_FOUNDATION "Enable Foundation, required for all components except CppUnit" ON)
option(ENABLE_ENCODINGS "Enable Encodings" ON) option(ENABLE_ENCODINGS "Enable Encodings" ON)
option(ENABLE_ENCODINGS_COMPILER "Enable Encodings Compiler" OFF) option(ENABLE_ENCODINGS_COMPILER "Enable Encodings Compiler" OFF)
option(ENABLE_XML "Enable XML" ON) option(ENABLE_XML "Enable XML" ON)
@@ -308,7 +309,9 @@ if(ENABLE_JWT)
set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE) set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)
endif() endif()
add_subdirectory(Foundation) if(ENABLE_FOUNDATION)
add_subdirectory(Foundation)
endif()
if(ENABLE_ENCODINGS) if(ENABLE_ENCODINGS)
add_subdirectory(Encodings) add_subdirectory(Encodings)
list(APPEND Poco_COMPONENTS "Encodings") list(APPEND Poco_COMPONENTS "Encodings")

4
CppParser/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(CppParser ${SRCS}) add_library(CppParser ${SRCS})

4
Crypto/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Crypto ${SRCS} ) add_library(Crypto ${SRCS} )

4
Data/CMakeLists.txt
View File

@@ -13,8 +13,8 @@ endif()
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Data ${SRCS} ) add_library(Data ${SRCS} )

4
Data/MySQL/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( MYSQL_SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND MYSQL_SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND MYSQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataMySQL ${MYSQL_SRCS} ) add_library(DataMySQL ${MYSQL_SRCS} )

4
Data/ODBC/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( ODBC_SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND ODBC_SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND ODBC_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataODBC ${ODBC_SRCS}) add_library(DataODBC ${ODBC_SRCS})

4
Data/PostgreSQL/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( POSTGRESQL_SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND POSTGRESQL_SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND POSTGRESQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataPostgreSQL ${POSTGRESQL_SRCS} ) add_library(DataPostgreSQL ${POSTGRESQL_SRCS} )

4
Data/SQLite/CMakeLists.txt
View File

@@ -21,8 +21,8 @@ endif()
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SQLITE_SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SQLITE_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(DataSQLite ${SQLITE_SRCS} ) add_library(DataSQLite ${SQLITE_SRCS} )

4
Encodings/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS( SRCS Encodings ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Encodings ${SRCS} ) add_library(Encodings ${SRCS} )

4
Foundation/CMakeLists.txt
View File

@@ -25,8 +25,8 @@ endif()
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
# Messages # Messages

2
Foundation/samples/StringTokenizer/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(StringTokenizer src/StringTokenizer.cpp) add_executable(StringTokenizer src/StringTokenizer.cpp)
target_link_libraries(StringTokenizer PUBLIC Poco::JSON Poco::XML Poco::Foundation) target_link_libraries(StringTokenizer PUBLIC Poco::Foundation)

2
Foundation/samples/URI/CMakeLists.txt
View File

@@ -1,2 +1,2 @@
add_executable(URI src/URI.cpp) add_executable(URI src/URI.cpp)
target_link_libraries(URI PUBLIC Poco::JSON Poco::XML Poco::Foundation ) target_link_libraries(URI PUBLIC Poco::Foundation )

4
JSON/CMakeLists.txt
View File

@@ -9,8 +9,8 @@ POCO_SOURCES(SRCS pdjson src/pdjson.c)
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(JSON ${SRCS} ) add_library(JSON ${SRCS} )

4
JWT/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(JWT ${SRCS} ) add_library(JWT ${SRCS} )

4
MongoDB/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(MongoDB ${SRCS} ) add_library(MongoDB ${SRCS} )

4
Net/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Net ${SRCS} ) add_library(Net ${SRCS} )

4
NetSSL_OpenSSL/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(NetSSL ${SRCS} ) add_library(NetSSL ${SRCS} )

4
NetSSL_Win/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(NetSSLWin ${SRCS}) add_library(NetSSLWin ${SRCS})

12
NetSSL_Win/CMakeLists.txt.rej Normal file
View File

@@ -0,0 +1,12 @@
diff a/NetSSL_Win/CMakeLists.txt b/NetSSL_Win/CMakeLists.txt (rejected hunks)
@@ -11,8 +11,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource
if(MSVC AND NOT POCO_STATIC)
- source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc)
- list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc)
+ source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
+ list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif()
add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS} )

4
PDF/CMakeLists.txt
View File

@@ -115,8 +115,8 @@ POCO_SOURCES( SRCS libpng
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
#TODO: Can we put this with the below includes? PRIVAT eg. #TODO: Can we put this with the below includes? PRIVAT eg.

4
Redis/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Redis ${SRCS} ) add_library(Redis ${SRCS} )

4
SevenZip/CMakeLists.txt
View File

@@ -49,8 +49,8 @@ POCO_SOURCES( SRCS 7z
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(SevenZip ${SRCS} ) add_library(SevenZip ${SRCS} )

4
Util/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
POCO_SOURCES_AUTO_PLAT( SRCS WIN32 POCO_SOURCES_AUTO_PLAT( SRCS WIN32

4
XML/CMakeLists.txt
View File

@@ -13,8 +13,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
# If POCO_UNBUNDLED is enabled we try to find the required packages # If POCO_UNBUNDLED is enabled we try to find the required packages

4
Zip/CMakeLists.txt
View File

@@ -8,8 +8,8 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
# Version Resource # Version Resource
if(MSVC AND NOT POCO_STATIC) if(MSVC AND NOT POCO_STATIC)
source_group("Resources" FILES ${CMAKE_SOURCE_DIR}/DLLVersion.rc) source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
list(APPEND SRCS ${CMAKE_SOURCE_DIR}/DLLVersion.rc) list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
endif() endif()
add_library(Zip ${SRCS} ) add_library(Zip ${SRCS} )