Fix path to DLLVersion.rc and enable to skip Foundation; Fix Foundati…

…on samples referencing useless libs
ivan-tkatchev · Oct 18, 2019 · 990f782 · 990f782
1 parent d658cc2
commit 990f782
Show file tree

Hide file tree

Showing 25 changed files with 60 additions and 45 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -175,6 +175,7 @@ else()
 endif()
 
 # 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_COMPILER "Enable Encodings Compiler" OFF)
 option(ENABLE_XML "Enable XML" ON)
@@ -308,7 +309,9 @@ if(ENABLE_JWT)
     set(ENABLE_JSON ON CACHE BOOL "Enable JSON" FORCE)
 endif()
 
-add_subdirectory(Foundation)
+if(ENABLE_FOUNDATION)
+    add_subdirectory(Foundation)
+endif()
 if(ENABLE_ENCODINGS)
     add_subdirectory(Encodings)
     list(APPEND Poco_COMPONENTS "Encodings")

diff --git a/CppParser/CMakeLists.txt b/CppParser/CMakeLists.txt
@@ -8,8 +8,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(CppParser ${SRCS})

diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt
@@ -8,8 +8,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(Crypto ${SRCS} )

diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
@@ -13,8 +13,8 @@ endif()
 
 # 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(Data ${SRCS} )

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

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

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

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

diff --git a/Encodings/CMakeLists.txt b/Encodings/CMakeLists.txt
@@ -8,8 +8,8 @@ POCO_HEADERS( SRCS Encodings ${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(Encodings ${SRCS} )

diff --git a/Foundation/CMakeLists.txt b/Foundation/CMakeLists.txt
@@ -25,8 +25,8 @@ endif()
 
 # 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()
 
 # Messages

diff --git a/Foundation/samples/StringTokenizer/CMakeLists.txt b/Foundation/samples/StringTokenizer/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(StringTokenizer src/StringTokenizer.cpp)
-target_link_libraries(StringTokenizer PUBLIC Poco::JSON Poco::XML Poco::Foundation)
+target_link_libraries(StringTokenizer PUBLIC Poco::Foundation)
diff --git a/Foundation/samples/URI/CMakeLists.txt b/Foundation/samples/URI/CMakeLists.txt
@@ -1,2 +1,2 @@
 add_executable(URI src/URI.cpp)
-target_link_libraries(URI PUBLIC Poco::JSON Poco::XML Poco::Foundation )
+target_link_libraries(URI PUBLIC Poco::Foundation )
diff --git a/JSON/CMakeLists.txt b/JSON/CMakeLists.txt
@@ -9,8 +9,8 @@ POCO_SOURCES(SRCS pdjson src/pdjson.c)
 
 # 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(JSON ${SRCS} )

diff --git a/JWT/CMakeLists.txt b/JWT/CMakeLists.txt
@@ -8,8 +8,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(JWT ${SRCS} )

diff --git a/MongoDB/CMakeLists.txt b/MongoDB/CMakeLists.txt
@@ -8,8 +8,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(MongoDB ${SRCS} )

diff --git a/Net/CMakeLists.txt b/Net/CMakeLists.txt
@@ -8,8 +8,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(Net ${SRCS} )

diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt
@@ -8,8 +8,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(NetSSL ${SRCS} )

diff --git a/NetSSL_Win/CMakeLists.txt b/NetSSL_Win/CMakeLists.txt
@@ -8,8 +8,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(NetSSLWin ${SRCS})

diff --git a/NetSSL_Win/CMakeLists.txt.rej b/NetSSL_Win/CMakeLists.txt.rej
@@ -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} )
diff --git a/PDF/CMakeLists.txt b/PDF/CMakeLists.txt
@@ -115,8 +115,8 @@ POCO_SOURCES( SRCS libpng
 
 # 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()
 
 #TODO: Can we put this with the below includes? PRIVAT eg.

diff --git a/Redis/CMakeLists.txt b/Redis/CMakeLists.txt
@@ -8,8 +8,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(Redis ${SRCS} )

diff --git a/SevenZip/CMakeLists.txt b/SevenZip/CMakeLists.txt
@@ -49,8 +49,8 @@ POCO_SOURCES( SRCS 7z
 
 # 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(SevenZip ${SRCS} )

diff --git a/Util/CMakeLists.txt b/Util/CMakeLists.txt
@@ -8,8 +8,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()
 
 POCO_SOURCES_AUTO_PLAT( SRCS WIN32

diff --git a/XML/CMakeLists.txt b/XML/CMakeLists.txt
@@ -13,8 +13,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()
 
 # If POCO_UNBUNDLED is enabled we try to find the required packages

diff --git a/Zip/CMakeLists.txt b/Zip/CMakeLists.txt
@@ -8,8 +8,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(Zip ${SRCS} )