generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-04-01 01:16:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'pocoproject/poco-1.9.1' into poco-1.9.1

Browse Source
This commit is contained in:
Francis ANDRE 2018-10-20 01:08:43 +02:00
commit 90de6442c1
10 changed files with 67 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
CMakeLists.txt
View File

@ -30,29 +30,29 @@ endif()
################################################################################# #################################################################################
# Setup C/C++ compiler options # Setup C/C++ compiler options
################################################################################# #################################################################################
option(DISABLE_CPP11 "Disable C++11 if available" OFF) option(DISABLE_CPP11 "Disable C++11 if not available" OFF)
option(DISABLE_CPP14 "Disable C++14 if available" OFF) option(DISABLE_CPP14 "Disable C++14 if not available" OFF)
if (DISABLE_CPP11 OR DISABLE_CPP14) if(NOT DISABLE_CPP11 OR NOT DISABLE_CPP14)
add_definitions(-DPOCO_DISABLE_CPP11)
if (DISABLE_CPP14)
add_definitions(-DPOCO_DISABLE_CPP14)
endif()
else()
# C++11/14 compiler flags # C++11/14 compiler flags
include(CXX1x) include(CXX1x)
check_for_cxx11_compiler(CXX11_COMPILER) check_for_cxx11_compiler(CXX11_COMPILER)
# If a C++11 compiler is available, then set the appropriate flags # If a C++11 compiler is available, then set the appropriate flags
if(CXX11_COMPILER) if(CXX11_COMPILER)
enable_cxx11() set (CMAKE_CXX_STANDARD 11)
check_for_cxx14_compiler(CXX14_COMPILER) set (CMAKE_CXX_STANDARD_REQUIRED ON)
check_for_cxx14_compiler(CXX14_COMPILER)
# If a C++14 compiler is available, then set the appropriate flags # If a C++14 compiler is available, then set the appropriate flags
if(CXX14_COMPILER) if(CXX14_COMPILER)
enable_cxx14() set(CMAKE_CXX_STANDARD 14)
endif() else()
set(DISABLE_CPP14 ON CACHE BOOL "Disable C++14 if not available" FORCE)
endif()
else()
set(DISABLE_CPP11 ON CACHE BOOL "Disable C++11 if not available" FORCE)
set(DISABLE_CPP14 ON CACHE BOOL "Disable C++14 if not available" FORCE)
endif() endif()
endif() endif()

6
Data/CMakeLists.txt
View File

@ -44,21 +44,21 @@ if(MYSQL_FOUND AND ENABLE_DATA_MYSQL)
message(STATUS "MySQL Support Enabled") message(STATUS "MySQL Support Enabled")
add_subdirectory( MySQL ) add_subdirectory( MySQL )
else() else()
message(STATUS "MySQL Support Disabled - no MySQL library") message(STATUS "MySQL Support Disabled")
endif() endif()
if(POSTGRESQL_FOUND AND ENABLE_DATA_POSTGRESQL) if(POSTGRESQL_FOUND AND ENABLE_DATA_POSTGRESQL)
message(STATUS "PostgreSQL Support Enabled") message(STATUS "PostgreSQL Support Enabled")
add_subdirectory( PostgreSQL ) add_subdirectory( PostgreSQL )
else() else()
message(STATUS "PostgreSQL Support Disabled - no PostgreSQL library") message(STATUS "PostgreSQL Support Disabled")
endif() endif()
if(ODBC_FOUND AND ENABLE_DATA_ODBC AND NOT WINCE) if(ODBC_FOUND AND ENABLE_DATA_ODBC AND NOT WINCE)
message(STATUS "ODBC Support Enabled") message(STATUS "ODBC Support Enabled")
add_subdirectory( ODBC ) add_subdirectory( ODBC )
else() else()
message(STATUS "ODBC Support Disabled - no ODBC runtime") message(STATUS "ODBC Support Disabled")
endif() endif()
if (ENABLE_TESTS) if (ENABLE_TESTS)

4
Data/MySQL/CMakeLists.txt
View File

@ -24,6 +24,10 @@ target_include_directories(DataMySQL
) )
target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL) target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL)
if(WIN32)
target_compile_definitions(DataMySQL PUBLIC __LCC__) #__LCC__ define used by MySQL.h
endif()
POCO_INSTALL(DataMySQL) POCO_INSTALL(DataMySQL)
POCO_GENERATE_PACKAGE(DataMySQL) POCO_GENERATE_PACKAGE(DataMySQL)

13
Foundation/CMakeLists.txt
View File

@ -105,7 +105,18 @@ target_include_directories(Foundation
target_compile_definitions(Foundation target_compile_definitions(Foundation
PUBLIC PUBLIC
$<$<CONFIG:Debug>:_DEBUG> $<$<CONFIG:Debug>:_DEBUG>
$<$<BOOL:${DISABLE_CPP14}>:POCO_DISABLE_CPP14>
$<$<NOT:$<BOOL:${DISABLE_CPP14}>>:POCO_ENABLE_CPP14>
$<$<BOOL:${DISABLE_CPP11}>:POCO_DISABLE_CPP11>
$<$<NOT:$<BOOL:${DISABLE_CPP11}>>:POCO_ENABLE_CPP11>
) )
target_compile_features(Foundation
PUBLIC
$<$<NOT:$<BOOL:${DISABLE_CPP11}>>:cxx_defaulted_move_initializers>
)
if(NOT DISABLE_CPP14 AND CMAKE_VERSION VERSION_GREATER 3.7)
target_compile_features(Foundation PUBLIC cxx_std_14)
endif()
if(NOT BUILD_SHARED_LIBS) if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(Foundation target_compile_definitions(Foundation
@ -115,7 +126,7 @@ if(NOT BUILD_SHARED_LIBS)
endif() endif()
if(WIN32) if(WIN32)
target_compile_definitions(Foundation PUBLIC POCO_NO_AUTOMATIC_LIBS POCO_OS_FAMILY_WINDOWS UNICODE _UNICODE __LCC__) #__LCC__ define used by MySQL.h target_compile_definitions(Foundation PUBLIC POCO_NO_AUTOMATIC_LIBS POCO_OS_FAMILY_WINDOWS UNICODE _UNICODE)
target_link_libraries(Foundation PUBLIC iphlpapi) target_link_libraries(Foundation PUBLIC iphlpapi)
endif() endif()

2
appveyor.yml
View File

@ -5,5 +5,5 @@ install:
build_script: build_script:
- set PATH=C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\bin;%PATH% - set PATH=C:\Program Files\CMake\bin;C:\ProgramData\chocolatey\bin;%PATH%
- cmake -H. -Bcmake-build -DENABLE_DATA_POSTGRESQL=OFF - cmake -H. -Bcmake-build -G"Visual Studio 14 2015 Win64" -DODBC_ROOT_LIBRARY_DIRS="C:/Program Files/Microsoft SDKs/Windows/v7.0/Lib/x64" -DODBC_ROOT_INCLUDE_DIRS="C:/Program Files/Microsoft SDKs/Windows/v7.0/Include" -DENABLE_DATA_MYSQL=OFF
- cmake --build cmake-build - cmake --build cmake-build

14
cmake/CXX1x.cmake
View File

@ -42,13 +42,6 @@ macro(check_for_cxx11_compiler _VAR)
endif() endif()
endmacro() endmacro()
# Sets the appropriate flag to enable C++11 support
macro(enable_cxx11)
set (CMAKE_CXX_STANDARD 11)
set (CMAKE_CXX_STANDARD_REQUIRED ON)
add_definitions(-DPOCO_ENABLE_CPP11)
endmacro()
# Determines whether the compiler supports C++14 # Determines whether the compiler supports C++14
macro(check_for_cxx14_compiler _VAR) macro(check_for_cxx14_compiler _VAR)
message(STATUS "Checking for C++14 compiler") message(STATUS "Checking for C++14 compiler")
@ -72,10 +65,3 @@ macro(check_for_cxx14_compiler _VAR)
message(STATUS "Checking for C++14 compiler - unavailable") message(STATUS "Checking for C++14 compiler - unavailable")
endif() endif()
endmacro() endmacro()
# Sets the appropriate flag to enable C++14 support
macro(enable_cxx14)
set (CMAKE_CXX_STANDARD 14)
set (CMAKE_CXX_STANDARD_REQUIRED ON)
add_definitions(-DPOCO_ENABLE_CPP14)
endmacro()

4
cmake/DefinePlatformSpecifc.cmake
View File

@ -40,11 +40,11 @@ if(MSVC)
else(POCO_MT) else(POCO_MT)
set(STATIC_POSTFIX "md" CACHE STRING "Set static library postfix" FORCE) set(STATIC_POSTFIX "md" CACHE STRING "Set static library postfix" FORCE)
endif(POCO_MT) endif(POCO_MT)
if (ENABLE_MSVC_MP) if (ENABLE_MSVC_MP)
add_definitions(/MP) add_definitions(/MP)
endif() endif()
else(MSVC) else(MSVC)
# Other compilers then MSVC don't have a static STATIC_POSTFIX at the moment # Other compilers then MSVC don't have a static STATIC_POSTFIX at the moment
set(STATIC_POSTFIX "" CACHE STRING "Set static library postfix" FORCE) set(STATIC_POSTFIX "" CACHE STRING "Set static library postfix" FORCE)

29
cmake/FindMySQL.cmake
View File

@ -40,14 +40,18 @@ find_path(MYSQL_INCLUDE_DIR mysql.h
$ENV{MYSQL_INCLUDE_DIR} $ENV{MYSQL_INCLUDE_DIR}
$ENV{MYSQL_DIR}/include $ENV{MYSQL_DIR}/include
$ENV{ProgramFiles}/MySQL/*/include $ENV{ProgramFiles}/MySQL/*/include
${BINDIR32}/MySQL/include ${BINDIR32}/MySQL/*/include
$ENV{SystemDrive}/MySQL/*/include $ENV{SystemDrive}/MySQL/*/include
$ENV{MARIADB_INCLUDE_DIR}
$ENV{MARIADB_DIR}/include
${MARIADB_INCLUDE_DIR}
${MARIADB_DIR}/include
PATH_SUFFIXES PATH_SUFFIXES
mysql mysql
mariadb mariadb
) )
if (WIN32) if (MSVC)
if (CMAKE_BUILD_TYPE STREQUAL Debug) if (CMAKE_BUILD_TYPE STREQUAL Debug)
set(libsuffixDist debug) set(libsuffixDist debug)
set(libsuffixBuild Debug) set(libsuffixBuild Debug)
@ -59,17 +63,23 @@ if (WIN32)
find_library(MYSQL_LIBRARY NAMES mysqlclient find_library(MYSQL_LIBRARY NAMES mysqlclient
HINTS HINTS
${MYSQL_ROOT_DIR}/lib/${libsuffixDist} ${MYSQL_ROOT_DIR}/lib
${MYSQL_ROOT_LIBRARY_DIRS} ${MYSQL_ROOT_LIBRARY_DIRS}
PATHS PATHS
${PC_MYSQL_LIBRARY_DIRS} ${PC_MYSQL_LIBRARY_DIRS}
${PC_MARIADB_LIBRARY_DIRS} ${PC_MARIADB_LIBRARY_DIRS}
$ENV{MYSQL_DIR}/lib/${libsuffixDist} $ENV{MYSQL_DIR}/lib
$ENV{MYSQL_DIR}/libmysql/${libsuffixBuild} $ENV{MYSQL_DIR}/libmysql
$ENV{MYSQL_DIR}/client/${libsuffixBuild} $ENV{MYSQL_DIR}/client
$ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist} $ENV{ProgramFiles}/MySQL/*/lib
${BINDIR32}/MySQL/lib ${BINDIR32}/MySQL/*/lib
$ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist} $ENV{SystemDrive}/MySQL/*/lib
PATH_SUFFIXES
vs12
vs11
vs10
${libsuffixDist}
${libsuffixBuild}
) )
else() else()
find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r mariadbclient find_library(MYSQL_LIBRARY NAMES mysqlclient mysqlclient_r mariadbclient
@ -85,6 +95,7 @@ else()
/opt/mysql/mysql/lib /opt/mysql/mysql/lib
$ENV{MYSQL_DIR}/libmysql_r/.libs $ENV{MYSQL_DIR}/libmysql_r/.libs
$ENV{MYSQL_DIR}/lib $ENV{MYSQL_DIR}/lib
${MYSQL_DIR}/lib
PATH_SUFFIXES PATH_SUFFIXES
mysql mysql
mariadb mariadb

17
cmake/FindODBC.cmake
View File

@ -56,6 +56,12 @@ else()
set(REQUIRED_INCLUDE_DIR ODBC_INCLUDE_DIR) set(REQUIRED_INCLUDE_DIR ODBC_INCLUDE_DIR)
endif() endif()
if(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
set(WIN_ARCH x64)
elseif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
set(WIN_ARCH x86)
endif()
find_library(ODBC_LIBRARY find_library(ODBC_LIBRARY
NAMES unixodbc iodbc odbc odbc32 NAMES unixodbc iodbc odbc odbc32
HINTS HINTS
@ -66,15 +72,15 @@ find_library(ODBC_LIBRARY
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/local/odbc/lib /usr/local/odbc/lib
/usr/local/iodbc/lib
"C:/Program Files/ODBC/lib" "C:/Program Files/ODBC/lib"
"C:/ODBC/lib/debug" "C:/ODBC/lib/debug"
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib" "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib"
"${kit81_dir}/Lib/winv6.3/um/x64" "${kit81_dir}/Lib/winv6.3/um"
"${kit_dir}/Lib/win8/um/x64" "${kit_dir}/Lib/win8/um"
"${kit81_dir}/Lib/winv6.3/um/x86"
"${kit_dir}/Lib/win8/um/x86"
PATH_SUFIXES PATH_SUFIXES
odbc odbc
${WIN_ARCH}
DOC "Specify the ODBC driver manager library here." DOC "Specify the ODBC driver manager library here."
) )
@ -86,8 +92,6 @@ endif()
# List additional libraries required to use ODBC library # List additional libraries required to use ODBC library
if(WIN32 AND MSVC OR CMAKE_CXX_COMPILER_ID MATCHES "Intel") if(WIN32 AND MSVC OR CMAKE_CXX_COMPILER_ID MATCHES "Intel")
set(_odbc_required_libs_names odbccp32;ws2_32) set(_odbc_required_libs_names odbccp32;ws2_32)
elseif(MINGW)
set(_odbc_required_libs_names odbccp32)
endif() endif()
foreach(_lib_name IN LISTS _odbc_required_libs_names) foreach(_lib_name IN LISTS _odbc_required_libs_names)
find_library(_lib_path find_library(_lib_path
@ -100,6 +104,7 @@ foreach(_lib_name IN LISTS _odbc_required_libs_names)
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/local/odbc/lib /usr/local/odbc/lib
/usr/local/iodbc/lib
"C:/Program Files/ODBC/lib" "C:/Program Files/ODBC/lib"
"C:/ODBC/lib/debug" "C:/ODBC/lib/debug"
"C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib" "C:/Program Files (x86)/Microsoft SDKs/Windows/v7.0A/Lib"

2
cmake/FindPostgreSQL.cmake
View File

@ -73,7 +73,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS} set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
"9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0") "10" "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
# Define additional search paths for root directories. # Define additional search paths for root directories.
set( PostgreSQL_ROOT_DIRECTORIES set( PostgreSQL_ROOT_DIRECTORIES