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

removing POCO_OS_* declarations from cmake and biicode configuration

Browse Source
This commit is contained in:
Alex Boyd 2015-10-12 20:53:29 -04:00
parent 7f6e38438c
commit 1f7766caa5
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
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)
@ -81,4 +80,4 @@ find_package(APR)
find_package(Apache2) find_package(Apache2)
if(APRUTIL_FOUND AND APACHE_FOUND) if(APRUTIL_FOUND AND APACHE_FOUND)
target_include_directories(${BII_BLOCK_TARGET} INTERFACE "${APACHE_INCLUDE_DIR}" "${APRUTIL_INCLUDE_DIR}" ) target_include_directories(${BII_BLOCK_TARGET} INTERFACE "${APACHE_INCLUDE_DIR}" "${APRUTIL_INCLUDE_DIR}" )
endif(APRUTIL_FOUND AND APACHE_FOUND) endif(APRUTIL_FOUND AND APACHE_FOUND)

8
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)
@ -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)
@ -85,7 +84,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)