From 0d174d20aff12b156f64a9db28818ca50127437d Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 7 Nov 2018 20:05:40 +0100 Subject: [PATCH 1/3] Use SDK 8.1 to get rc.exe on the PATH --- buildwin.cmd | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/buildwin.cmd b/buildwin.cmd index 742139542..5710ae229 100644 --- a/buildwin.cmd +++ b/buildwin.cmd @@ -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 ) ) ) From 50f1487dd4b3045bb76cc376c8a4b41f49e70c32 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 7 Nov 2018 20:06:30 +0100 Subject: [PATCH 2/3] Use the develop nra,ch instead of the master branch until the master be fixed' --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index f69cfb292..adc0024da 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "openssl"] path = openssl url = https://github.com/pocoproject/openssl - branch = master + branch = develop [submodule "gradle"] path = gradle From c4fdcf7ef241e86967bacf9e1b5841499dc1decf Mon Sep 17 00:00:00 2001 From: Alexander Galanin Date: Tue, 4 Dec 2018 10:59:02 +0300 Subject: [PATCH 3/3] epoll() is absent on AIX --- cmake/DefinePlatformSpecifc.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/DefinePlatformSpecifc.cmake b/cmake/DefinePlatformSpecifc.cmake index f66454ac9..b29640589 100644 --- a/cmake/DefinePlatformSpecifc.cmake +++ b/cmake/DefinePlatformSpecifc.cmake @@ -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)