Skip to content

Commit b69fafb

Browse files
bachpbachp
committed
CMake: Create PocoConfig.cmake to make importable from other CMake projects
The generated PocoConfig.cmake can be used by other CMake projects using find_package.
1 parent c5ffa26 commit b69fafb

39 files changed

Lines changed: 678 additions & 167 deletions

‎ApacheConnector/CMakeLists.txt‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,18 @@ POCO_SOURCES_AUTO( SRCS ${SRCS_G})
88
file(GLOB_RECURSE HDRS_G "include/*.h" )
99
POCO_HEADERS_AUTO( SRCS ${HDRS_G})
1010

11-
include_directories( "include" )
12-
13-
add_library( ${LIBNAME} SHARED ${SRCS} )
14-
set_target_properties( ${LIBNAME}
11+
add_library( "${LIBNAME}" SHARED ${SRCS} )
12+
set_target_properties( "${LIBNAME}"
1513
PROPERTIES
1614
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
1715
DEFINE_SYMBOL ApacheHandlers_EXPORTS)
18-
target_link_libraries( ${LIBNAME} )
16+
target_link_libraries( "${LIBNAME}" )
17+
target_include_directories( "${LIBNAME}"
18+
PUBLIC
19+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
20+
$<INSTALL_INTERFACE:include>
21+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
22+
)
1923

2024
if (ENABLE_TESTS)
2125
add_subdirectory(samples)

‎CMakeLists.txt‎

Lines changed: 73 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
project(Poco)
1010

11-
cmake_minimum_required(VERSION 2.8.0)
11+
cmake_minimum_required(VERSION 3.0.0)
1212

1313
file(STRINGS "${CMAKE_SOURCE_DIR}/libversion" SHARED_LIBRARY_VERSION)
1414

@@ -75,12 +75,18 @@ option(ENABLE_PDF "Enable PDF" ON)
7575
option(ENABLE_UTIL "Enable Util" ON)
7676
option(ENABLE_NET "Enable Net" ON)
7777
option(ENABLE_NETSSL "Enable NetSSL" ON)
78+
option(ENABLE_NETSSL_WIN "Enable NetSSL Windows" ON)
7879
option(ENABLE_CRYPTO "Enable Crypto" ON)
7980
option(ENABLE_DATA "Enable Data" ON)
81+
option(ENABLE_DATA_SQLITE "Enable Data SQlite" ON)
82+
option(ENABLE_DATA_MYSQL "Enable Data MySQL" ON)
83+
option(ENABLE_DATA_ODBC "Enable Data ODBC" ON)
8084
option(ENABLE_SEVENZIP "Enable SevenZip" ON)
8185
option(ENABLE_ZIP "Enable Zip" ON)
8286
option(ENABLE_APACHECONNECTOR "Enable ApacheConnector" ON)
8387

88+
option(FORCE_OPENSSL "Force usage of OpenSSL even under windows" OFF)
89+
8490
option(ENABLE_TESTS
8591
"Set to OFF|ON (default is OFF) to control build of POCO tests & samples" OFF)
8692

@@ -115,32 +121,21 @@ else ()
115121
message(STATUS "Build with using internal copy of sqlite, libz, pcre, expat, ...")
116122
endif ()
117123

118-
# Set local include path
119-
include_directories( CppUnit/include CppUnit/WinTestRunner/include Foundation/include XML/include Net/include NetSSL_OpenSSL/include Util/include Data/include Data/MySQL/include Data/SQLite/include Data/ODBC/include Zip/include Crypto/include Web/include JSON/include MongoDB/include PDF/include SevenZip/include)
120-
121124
include(CheckTypeSize)
122125
find_package(Cygwin)
123126

124-
#include(CMakeDetermineCompilerId)
125-
126127
# OS Detection
127-
if(CMAKE_SYSTEM MATCHES "Windows")
128-
129-
add_definitions( -DPOCO_OS_FAMILY_WINDOWS)
130-
set(SYSLIBS iphlpapi gdi32 odbc32)
131-
132-
if (CMAKE_C_COMPILER_ID MATCHES "MSVC")
133-
message(STATUS "XXX: MS Visual Compiler detected")
134-
endif (CMAKE_C_COMPILER_ID MATCHES "MSVC")
128+
if(WIN32)
129+
add_definitions( -DPOCO_OS_FAMILY_WINDOWS -DUNICODE -D_UNICODE)
130+
#set(SYSLIBS iphlpapi gdi32 odbc32)
131+
endif(WIN32)
135132

136-
endif(CMAKE_SYSTEM MATCHES "Windows")
137-
138-
if (CMAKE_SYSTEM MATCHES "Linux" AND NOT ANDROID )
133+
if (UNIX AND NOT ANDROID )
139134
add_definitions( -DPOCO_OS_FAMILY_UNIX )
140135
# Standard 'must be' defines
141136
add_definitions( -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64)
142137
set(SYSLIBS pthread dl rt)
143-
endif(CMAKE_SYSTEM MATCHES "Linux" AND NOT ANDROID )
138+
endif(UNIX AND NOT ANDROID )
144139

145140
if (CMAKE_SYSTEM MATCHES "SunOS")
146141
add_definitions( -DPOCO_OS_FAMILY_UNIX )
@@ -150,15 +145,15 @@ if (CMAKE_SYSTEM MATCHES "SunOS")
150145
endif(CMAKE_SYSTEM MATCHES "SunOS")
151146

152147
if (CMAKE_COMPILER_IS_MINGW)
153-
add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400 -DPOCO_WIN32_UTF8)
154-
add_definitions(-mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED )
148+
add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400 -DPOCO_WIN32_UTF8)
149+
add_definitions(-mno-cygwin -D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO_THREAD_STACK_SIZE -DFoundation_Config_INCLUDED )
155150
link_directories(/usr/local/lib /usr/lib)
156151
include_directories(/usr/local/include /usr/include)
157152
endif (CMAKE_COMPILER_IS_MINGW)
158153

159-
if (CMAKE_COMPILER_IS_CYGWIN)
154+
if (CYGWIN)
160155
# add_definitions(-DWC_NO_BEST_FIT_CHARS=0x400 -DPOCO_WIN32_UTF8)
161-
endif (CMAKE_COMPILER_IS_CYGWIN)
156+
endif (CYGWIN)
162157

163158
# SunPro C++
164159
if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
@@ -170,10 +165,14 @@ if (IOS)
170165
add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS -DPOCO_NO_NET_IFTYPES )
171166
endif(IOS)
172167

173-
#ANDROID
168+
#Android
174169
if (ANDROID)
175170
add_definitions( -DPOCO_ANDROID -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_WSTRING -DPOCO_NO_SHAREDMEMORY )
176-
endif()
171+
endif(ANDROID)
172+
173+
174+
# Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file
175+
set(Poco_COMPONENTS "")
177176

178177
if (ENABLE_TESTS)
179178
add_subdirectory(CppUnit)
@@ -182,43 +181,62 @@ endif ()
182181
add_subdirectory(Foundation)
183182
if(ENABLE_XML)
184183
add_subdirectory(XML)
184+
list(APPEND Poco_COMPONENTS "XML")
185185
endif()
186186
if(ENABLE_JSON)
187187
add_subdirectory(JSON)
188+
list(APPEND Poco_COMPONENTS "JSON")
188189
endif()
189190
if(ENABLE_MONGODB)
190191
add_subdirectory(MongoDB)
192+
list(APPEND Poco_COMPONENTS "MongoDB")
191193
endif()
192194
if(ENABLE_PDF)
193195
add_subdirectory(PDF)
196+
list(APPEND Poco_COMPONENTS "PDF")
194197
endif()
195198
if(ENABLE_UTIL)
196199
add_subdirectory(Util)
200+
list(APPEND Poco_COMPONENTS "Util")
197201
endif()
198202
if(ENABLE_NET)
199203
add_subdirectory(Net)
204+
list(APPEND Poco_COMPONENTS "Net")
200205
endif()
201206

202-
# OPENSSL_SSL_LIBRARY
207+
208+
#NetSSL
209+
210+
211+
if(WIN32 AND ENABLE_NETSSL_WIN)
212+
add_subdirectory(NetSSL_Win)
213+
list(APPEND Poco_COMPONENTS "NetSSL_Win")
214+
endif(WIN32 AND ENABLE_NETSSL_WIN)
215+
203216
find_package(OpenSSL)
204217
if(OPENSSL_FOUND)
205218
include_directories("${OPENSSL_INCLUDE_DIR}")
206219
if(ENABLE_NETSSL)
207220
add_subdirectory(NetSSL_OpenSSL)
221+
list(APPEND Poco_COMPONENTS "NetSSL_OpenSSL")
208222
endif()
209223
if(ENABLE_CRYPTO)
210224
add_subdirectory(Crypto)
225+
list(APPEND Poco_COMPONENTS "Crypto")
211226
endif()
212227
endif(OPENSSL_FOUND)
213228

214229
if(ENABLE_DATA)
215230
add_subdirectory(Data)
231+
list(APPEND Poco_COMPONENTS "Data")
216232
endif()
217233
if(ENABLE_SEVENZIP)
218234
add_subdirectory(SevenZip)
235+
list(APPEND Poco_COMPONENTS "SevenZip")
219236
endif()
220237
if(ENABLE_ZIP)
221238
add_subdirectory(Zip)
239+
list(APPEND Poco_COMPONENTS "Zip")
222240
endif()
223241

224242
find_package(APR)
@@ -227,6 +245,7 @@ if(APRUTIL_FOUND AND APACHE_FOUND)
227245
include_directories( "${APACHE_INCLUDE_DIR}" "${APRUTIL_INCLUDE_DIR}" )
228246
if(ENABLE_APACHECONNECTOR)
229247
add_subdirectory(ApacheConnector)
248+
list(APPEND Poco_COMPONENTS "ApacheConnector")
230249
endif()
231250
endif(APRUTIL_FOUND AND APACHE_FOUND)
232251

@@ -253,9 +272,38 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY "/usr/local")
253272

254273
include(CPack)
255274

275+
#############################################################
276+
# cmake config files
277+
278+
include(CMakePackageConfigHelpers)
279+
write_basic_package_version_file(
280+
"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake"
281+
VERSION ${PROJECT_VERSION}
282+
COMPATIBILITY AnyNewerVersion
283+
)
284+
285+
configure_file(cmake/${PROJECT_NAME}Config.cmake.in "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake" @ONLY)
286+
install(
287+
FILES
288+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}Config.cmake
289+
${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}/${PROJECT_NAME}ConfigVersion.cmake
290+
DESTINATION
291+
"lib/cmake/${PROJECT_NAME}"
292+
COMPONENT
293+
Devel
294+
)
295+
296+
# in tree build settings
297+
#configure_file(PocoBuildTreeSettings.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PocoBuildTreeSettings.cmake @ONLY)
298+
299+
256300
message(STATUS "CMake ${CMAKE_VERSION} successfully configured ${PROJECT_NAME} using ${CMAKE_GENERATOR} generator")
257301
message(STATUS "Installation target path: ${CMAKE_INSTALL_PREFIX}")
258302

259303
message(STATUS "C_FLAGS: =${CMAKE_C_FLAGS}")
260304
message(STATUS "CXX_FLAGS:=${CMAKE_CXX_FLAGS}")
261305

306+
foreach(component ${Poco_COMPONENTS})
307+
message(STATUS "Building: ${component}")
308+
endforeach()
309+

‎CppUnit/CMakeLists.txt‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,18 @@ POCO_SOURCES_AUTO( SRCS ${SRCS_G})
88
file(GLOB_RECURSE HDRS_G "include/*.h" )
99
POCO_HEADERS_AUTO( SRCS ${HDRS_G})
1010

11-
add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
12-
set_target_properties( ${LIBNAME}
11+
add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS} )
12+
set_target_properties( "${LIBNAME}"
1313
PROPERTIES
1414
VERSION "1" SOVERSION "1"
1515
DEFINE_SYMBOL CppUnit_EXPORTS)
16-
target_link_libraries( ${LIBNAME} )
16+
target_link_libraries( "${LIBNAME}" )
17+
target_include_directories( "${LIBNAME}"
18+
PUBLIC
19+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
20+
$<INSTALL_INTERFACE:include>
21+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
22+
)
1723

1824
if(WIN32)
1925
add_subdirectory(WinTestRunner)

‎CppUnit/WinTestRunner/CMakeLists.txt‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,21 @@ POCO_HEADERS_AUTO( WIN_SRCS ${HDRS_G})
1313

1414
# TODO: Is this flag always required?
1515
add_definitions("-D_AFXDLL")
16+
#TODO: Use instead of the flag above: find_package(MFC)
1617

17-
include_directories( "src" )
18-
19-
add_library( ${LIBNAME} ${LIB_MODE} ${WIN_SRCS} )
20-
set_target_properties( ${LIBNAME}
18+
add_library( "${LIBNAME}" ${LIB_MODE} ${WIN_SRCS} )
19+
set_target_properties( "${LIBNAME}"
2120
PROPERTIES
2221
VERSION "1" SOVERSION "1"
2322
DEFINE_SYMBOL WinTestRunner_EXPORTS)
24-
target_link_libraries( ${LIBNAME} CppUnit )
23+
target_link_libraries( "${LIBNAME}" CppUnit )
24+
target_include_directories( "${LIBNAME}"
25+
PUBLIC
26+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
27+
$<INSTALL_INTERFACE:include>
28+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
29+
)
30+
2531
if(WIN32)
2632
target_link_libraries( ${LIBNAME} winmm )
2733
endif(WIN32)

‎Crypto/CMakeLists.txt‎

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
set(LIBNAME "PocoCrypto")
1+
set(LIBNAME "Crypto")
2+
set(POCO_LIBNAME "Poco${LIBNAME}")
23

34
# Sources
45
file(GLOB SRCS_G "src/*.cpp")
@@ -8,29 +9,41 @@ POCO_SOURCES_AUTO( SRCS ${SRCS_G})
89
file(GLOB_RECURSE HDRS_G "include/*.h" )
910
POCO_HEADERS_AUTO( SRCS ${HDRS_G})
1011

11-
add_definitions(-D_USRDLL)
12-
include_directories( "include" )
12+
#add_definitions(-D_USRDLL)
1313

14-
add_library( ${LIBNAME} ${LIB_MODE} ${SRCS} )
15-
set_target_properties( ${LIBNAME}
16-
PROPERTIES
14+
add_library( "${LIBNAME}" ${LIB_MODE} ${SRCS} )
15+
add_library( "${POCO_LIBNAME}" ALIAS "${LIBNAME}")
16+
set_target_properties( "${LIBNAME}"
17+
PROPERTIES
1718
VERSION ${SHARED_LIBRARY_VERSION} SOVERSION ${SHARED_LIBRARY_VERSION}
18-
DEFINE_SYMBOL Crypto_EXPORTS)
19-
target_link_libraries( ${LIBNAME} PocoFoundation ${OPENSSL_LIBRARIES} )
19+
OUTPUT_NAME ${POCO_LIBNAME}
20+
DEFINE_SYMBOL Crypto_EXPORTS
21+
)
2022

23+
target_link_libraries( "${LIBNAME}" Foundation ${OPENSSL_LIBRARIES} )
24+
target_include_directories( "${LIBNAME}"
25+
PUBLIC
26+
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
27+
$<INSTALL_INTERFACE:include>
28+
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
29+
)
2130
install(
2231
DIRECTORY include/Poco
2332
DESTINATION include
33+
COMPONENT Devel
2434
PATTERN ".svn" EXCLUDE
2535
)
2636

2737
install(
28-
TARGETS ${LIBNAME}
38+
TARGETS "${LIBNAME}" EXPORT "${LIBNAME}Targets"
2939
LIBRARY DESTINATION lib${LIB_SUFFIX}
3040
ARCHIVE DESTINATION lib${LIB_SUFFIX}
3141
RUNTIME DESTINATION bin
42+
INCLUDES DESTINATION include
3243
)
3344

45+
POCO_GENERATE_PACKAGE("${LIBNAME}" "${LIBNAME}Targets" "lib/cmake/${PROJECT_NAME}")
46+
3447
if (ENABLE_TESTS)
3548
add_subdirectory(samples)
3649
add_subdirectory(testsuite)

‎Crypto/cmake/PocoCryptoConfig.cmake‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
include(CMakeFindDependencyMacro)
2+
set(CMAKE_PREFIX_PATH ${CMAKE_CURRENT_LIST_DIR})
3+
find_dependency(PocoFoundation)
4+
include("${CMAKE_CURRENT_LIST_DIR}/PocoCryptoTargets.cmake")

0 commit comments

Comments
 (0)