mirror of
https://github.com/pocoproject/poco.git
synced 2025-11-01 21:13:10 +01:00
Activate 64bit by default on solaris, remove link with stlport which conflicts with c++11 (#1427)
This commit is contained in:

committed by
Aleksandar Fabijanic

parent
7a172f9d2d
commit
bba77c11a0
@@ -90,8 +90,11 @@ else (CYGWIN)
|
||||
set(SYSLIBS m socket)
|
||||
elseif(${CMAKE_SYSTEM} MATCHES "AIX")
|
||||
add_definitions(-D__IBMCPP_TR1__)
|
||||
elseif(${CMAKE_SYSTEM} MATCHES "SunOS")
|
||||
add_definitions(-m64)
|
||||
set(SYSLIBS pthread dl rt)
|
||||
else ()
|
||||
add_definitions( -D_XOPEN_SOURCE=500 -DPOCO_HAVE_FD_EPOLL)
|
||||
add_definitions(-D_XOPEN_SOURCE=500 -DPOCO_HAVE_FD_EPOLL)
|
||||
set(SYSLIBS pthread dl rt)
|
||||
endif ()
|
||||
endif (APPLE)
|
||||
@@ -100,7 +103,7 @@ endif (CYGWIN)
|
||||
|
||||
if (CMAKE_SYSTEM MATCHES "SunOS")
|
||||
# Standard 'must be' defines
|
||||
add_definitions( -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 )
|
||||
add_definitions( -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -m64 )
|
||||
set(SYSLIBS pthread socket xnet nsl resolv rt dl)
|
||||
endif(CMAKE_SYSTEM MATCHES "SunOS")
|
||||
|
||||
@@ -109,11 +112,6 @@ if (CMAKE_COMPILER_IS_MINGW)
|
||||
add_definitions(-D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO_THREAD_STACK_SIZE)
|
||||
endif (CMAKE_COMPILER_IS_MINGW)
|
||||
|
||||
# SunPro C++
|
||||
if (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
|
||||
add_definitions( -D_BSD_SOURCE -library=stlport4)
|
||||
endif (${CMAKE_CXX_COMPILER_ID} MATCHES "SunPro")
|
||||
|
||||
# iOS
|
||||
if (IOS)
|
||||
add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_FPENVIRONMENT -DPOCO_NO_STAT64 -DPOCO_NO_SHAREDLIBS -DPOCO_NO_NET_IFTYPES )
|
||||
|
Reference in New Issue
Block a user