generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-18 19:48:44 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #982 from aaboyd/feature/remove-poco-os-cmake

Browse Source 
removing POCO_OS_* declarations from cmake and biicode configuration
This commit is contained in:
Aleksandar Fabijanic
2015-10-12 22:51:20 -07:00
parent 205eb65bc9 1f7766caa5
commit 35d94f3842
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
biicode/cmake/biicode.cmake
View File

@@ -24,12 +24,11 @@ endif(POCO_STATIC)
# OS Detection # OS Detection
if(WIN32) if(WIN32)
target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_OS_FAMILY_WINDOWS -DUNICODE -D_UNICODE) target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DUNICODE -D_UNICODE)
#set(SYSLIBS iphlpapi gdi32 odbc32) #set(SYSLIBS iphlpapi gdi32 odbc32)
endif(WIN32) endif(WIN32)
if (UNIX AND NOT ANDROID ) if (UNIX AND NOT ANDROID )
target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_OS_FAMILY_UNIX )
# Standard 'must be' defines # Standard 'must be' defines
if (APPLE) if (APPLE)
target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64) target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64)

4
cmake/DefinePlatformSpecifc.cmake
View File

@@ -69,11 +69,10 @@ include(CheckTypeSize)
find_package(Cygwin) find_package(Cygwin)
if(WIN32) if(WIN32)
add_definitions( -DPOCO_OS_FAMILY_WINDOWS -DUNICODE -D_UNICODE -D__LCC__) #__LCC__ define used by MySQL.h add_definitions( -DUNICODE -D_UNICODE -D__LCC__) #__LCC__ define used by MySQL.h
endif(WIN32) endif(WIN32)
if (UNIX AND NOT ANDROID ) if (UNIX AND NOT ANDROID )
add_definitions( -DPOCO_OS_FAMILY_UNIX )
# Standard 'must be' defines # Standard 'must be' defines
if (APPLE) if (APPLE)
add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64) add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64)
@@ -91,7 +90,6 @@ if (UNIX AND NOT ANDROID )
endif(UNIX AND NOT ANDROID ) endif(UNIX AND NOT ANDROID )
if (CMAKE_SYSTEM MATCHES "SunOS") if (CMAKE_SYSTEM MATCHES "SunOS")
add_definitions( -DPOCO_OS_FAMILY_UNIX )
# Standard 'must be' defines # 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_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 )
set(SYSLIBS pthread socket xnet nsl resolv rt dl) set(SYSLIBS pthread socket xnet nsl resolv rt dl)