remove POCO_STATIC

2025-10-29 09:42:31 +00:00 · 2020-02-12 22:10:01 +01:00
parent bb63b28121
commit 75a86ad868
23 changed files with 32 additions and 40 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -53,20 +53,12 @@ endif()
 # Include some common macros to simpilfy the Poco CMake files
 include(PocoMacros)

-option(POCO_STATIC
-  "Set to OFF|ON (default is OFF) to control build of POCO as STATIC library" OFF)
-if(POCO_STATIC)
-    option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
-else()
-    option(BUILD_SHARED_LIBS "Build shared libraries" ON)
-endif()
+option(BUILD_SHARED_LIBS "Build shared libraries" ON)

 if(MSVC)
-    option(POCO_MT
-      "Set to OFF|ON (default is OFF) to control build of POCO as /MT instead of /MD" OFF)
+    option(POCO_MT "Set to OFF|ON (default is OFF) to control build of POCO as /MT instead of /MD" ON)

-    option(ENABLE_MSVC_MP
-      "Set to OFF|ON (default is OFF) to control parallel build of POCO with MSVC" OFF)
+    option(ENABLE_MSVC_MP "Set to OFF|ON (default is OFF) to control parallel build of POCO with MSVC" ON)

    # allow disabling of internally built OpenSSL# (see below for details)
    # if POCO pre-built OpenSSL directory is found, and POCO_DISABLE_INTERNAL_OPENSSL=OFF,
--- a/CppParser/CMakeLists.txt
+++ b/CppParser/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Crypto/CMakeLists.txt
+++ b/Crypto/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
@@ -26,7 +26,7 @@ target_include_directories(Crypto
    PUBLIC
        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
        $<INSTALL_INTERFACE:include>
-    PRIVATE 
+    PRIVATE
        ${CMAKE_CURRENT_SOURCE_DIR}/src
    )

--- a/Data/CMakeLists.txt
+++ b/Data/CMakeLists.txt
@@ -12,7 +12,7 @@ if(MSVC AND NOT(MSVC_VERSION LESS 1400))
 endif()

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Data/MySQL/CMakeLists.txt
+++ b/Data/MySQL/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( MYSQL_SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND MYSQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Data/ODBC/CMakeLists.txt
+++ b/Data/ODBC/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( ODBC_SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND ODBC_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Data/PostgreSQL/CMakeLists.txt
+++ b/Data/PostgreSQL/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( POSTGRESQL_SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND POSTGRESQL_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Data/SQLite/CMakeLists.txt
+++ b/Data/SQLite/CMakeLists.txt
@@ -20,7 +20,7 @@ else()
 endif()

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SQLITE_SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Encodings/CMakeLists.txt
+++ b/Encodings/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS( SRCS Encodings ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Foundation/CMakeLists.txt
+++ b/Foundation/CMakeLists.txt
@@ -24,7 +24,7 @@ POCO_SOURCES_AUTO_PLAT( SRCS WIN32
 endif()

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
@@ -226,7 +226,7 @@ POCO_INSTALL(Foundation)
 POCO_GENERATE_PACKAGE(Foundation)

 if (ENABLE_TESTS)
-	if(POCO_STATIC)
+	if(NOT BUILD_SHARED_LIBS)
 	  set_property(TARGET Foundation PROPERTY POSITION_INDEPENDENT_CODE ON) # This is needed to build TestLibrary.so as shared.
 	endif()
 	add_subdirectory(samples)
--- a/JSON/CMakeLists.txt
+++ b/JSON/CMakeLists.txt
@@ -8,7 +8,7 @@ POCO_HEADERS_AUTO( SRCS ${HDRS_G})
 POCO_SOURCES(SRCS pdjson src/pdjson.c)

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/JWT/CMakeLists.txt
+++ b/JWT/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/MongoDB/CMakeLists.txt
+++ b/MongoDB/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Net/CMakeLists.txt
+++ b/Net/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/NetSSL_OpenSSL/CMakeLists.txt
+++ b/NetSSL_OpenSSL/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/NetSSL_Win/CMakeLists.txt
+++ b/NetSSL_Win/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/PDF/CMakeLists.txt
+++ b/PDF/CMakeLists.txt
@@ -114,7 +114,7 @@ POCO_SOURCES( SRCS libpng
 )

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Redis/CMakeLists.txt
+++ b/Redis/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/SevenZip/CMakeLists.txt
+++ b/SevenZip/CMakeLists.txt
@@ -48,7 +48,7 @@ POCO_SOURCES( SRCS 7z
 )

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Util/CMakeLists.txt
+++ b/Util/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/XML/CMakeLists.txt
+++ b/XML/CMakeLists.txt
@@ -12,7 +12,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/Zip/CMakeLists.txt
+++ b/Zip/CMakeLists.txt
@@ -7,7 +7,7 @@ file(GLOB_RECURSE HDRS_G "include/*.h" )
 POCO_HEADERS_AUTO( SRCS ${HDRS_G})

 # Version Resource
-if(MSVC AND NOT POCO_STATIC)
+if(MSVC AND BUILD_SHARED_LIBS)
    source_group("Resources" FILES ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
    list(APPEND SRCS ${PROJECT_SOURCE_DIR}/DLLVersion.rc)
 endif()
--- a/cmake/DefinePlatformSpecifc.cmake
+++ b/cmake/DefinePlatformSpecifc.cmake
@@ -53,16 +53,16 @@ endif(MSVC)


 # Add a d postfix to the debug libraries
-if(POCO_STATIC)
-        set(CMAKE_DEBUG_POSTFIX "${STATIC_POSTFIX}d" CACHE STRING "Set Debug library postfix" FORCE)
-        set(CMAKE_RELEASE_POSTFIX "${STATIC_POSTFIX}" CACHE STRING "Set Release library postfix" FORCE)
-        set(CMAKE_MINSIZEREL_POSTFIX "${STATIC_POSTFIX}" CACHE STRING "Set MinSizeRel library postfix" FORCE)
-        set(CMAKE_RELWITHDEBINFO_POSTFIX "${STATIC_POSTFIX}" CACHE STRING "Set RelWithDebInfo library postfix" FORCE)
-else(POCO_STATIC)
+if(BUILD_SHARED_LIBS)
        set(CMAKE_DEBUG_POSTFIX "d" CACHE STRING "Set Debug library postfix" FORCE)
        set(CMAKE_RELEASE_POSTFIX "" CACHE STRING "Set Release library postfix" FORCE)
        set(CMAKE_MINSIZEREL_POSTFIX "" CACHE STRING "Set MinSizeRel library postfix" FORCE)
        set(CMAKE_RELWITHDEBINFO_POSTFIX "" CACHE STRING "Set RelWithDebInfo library postfix" FORCE)
+else(BUILD_SHARED_LIBS)
+        set(CMAKE_DEBUG_POSTFIX "${STATIC_POSTFIX}d" CACHE STRING "Set Debug library postfix" FORCE)
+        set(CMAKE_RELEASE_POSTFIX "${STATIC_POSTFIX}" CACHE STRING "Set Release library postfix" FORCE)
+        set(CMAKE_MINSIZEREL_POSTFIX "${STATIC_POSTFIX}" CACHE STRING "Set MinSizeRel library postfix" FORCE)
+        set(CMAKE_RELWITHDEBINFO_POSTFIX "${STATIC_POSTFIX}" CACHE STRING "Set RelWithDebInfo library postfix" FORCE)
 endif()