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

Merge branch 'poco-1.9.0' of github.com:pocoproject/poco into poco-1.9.0

Browse Source
This commit is contained in:
Günter Obiltschnig 2019-01-25 14:00:21 +01:00
commit a65979c7df
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -1,7 +1,7 @@
[submodule "openssl"]
path = openssl
url = https://github.com/pocoproject/openssl
branch = master
branch = develop
[submodule "gradle"]
path = gradle

20
buildwin.cmd
View File

@ -70,37 +70,37 @@ if not defined VCINSTALLDIR (
) else (
if %VS_VERSION%==vs100 (
if %PLATFORM%==x64 (
call "%VS100COMNTOOLS%%VS_VARSALL%" x86_amd64
call "%VS100COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
) else (
call "%VS100COMNTOOLS%%VS_VARSALL%" x86
call "%VS100COMNTOOLS%%VS_VARSALL%" x86 8.1
)
) else (
if %VS_VERSION%==vs110 (
if %PLATFORM%==x64 (
call "%VS110COMNTOOLS%%VS_VARSALL%" x86_amd64
call "%VS110COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
) else (
call "%VS110COMNTOOLS%%VS_VARSALL%" x86
call "%VS110COMNTOOLS%%VS_VARSALL%" x86 8.1
)
) else (
if %VS_VERSION%==vs120 (
if %PLATFORM%==x64 (
call "%VS120COMNTOOLS%%VS_VARSALL%" x86_amd64
call "%VS120COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
) else (
call "%VS120COMNTOOLS%%VS_VARSALL%" x86
call "%VS120COMNTOOLS%%VS_VARSALL%" x86 8.1
)
) else (
if %VS_VERSION%==vs140 (
if %PLATFORM%==x64 (
call "%VS140COMNTOOLS%%VS_VARSALL%" x86_amd64
call "%VS140COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
) else (
call "%VS140COMNTOOLS%%VS_VARSALL%" x86
call "%VS140COMNTOOLS%%VS_VARSALL%" x86 8.1
)
) else (
if %VS_VERSION%==vs150 (
if %PLATFORM%==x64 (
call "%VS150COMNTOOLS%%VS_VARSALL%" x86_amd64
call "%VS150COMNTOOLS%%VS_VARSALL%" x86_amd64 8.1
) else (
call "%VS150COMNTOOLS%%VS_VARSALL%" x86
call "%VS150COMNTOOLS%%VS_VARSALL%" x86 8.1
)
)
)

7
cmake/DefinePlatformSpecifc.cmake
View File

@ -92,7 +92,12 @@ else (CYGWIN)
add_definitions( -DPOCO_HAVE_FD_POLL)
set(SYSLIBS m socket)
else (QNX)
add_definitions( -D_XOPEN_SOURCE=500 -DPOCO_HAVE_FD_EPOLL)
add_definitions( -D_XOPEN_SOURCE=500)
if (${CMAKE_SYSTEM} MATCHES "AIX")
add_definitions( -DPOCO_HAVE_FD_POLL)
else()
add_definitions( -DPOCO_HAVE_FD_EPOLL)
endif()
set(SYSLIBS pthread ${CMAKE_DL_LIBS} rt)
endif (QNX)
endif (APPLE)