From 1f7766caa57047a2841c947082bfc79b8c060472 Mon Sep 17 00:00:00 2001 From: Alex Boyd Date: Mon, 12 Oct 2015 20:53:29 -0400 Subject: [PATCH] removing POCO_OS_* declarations from cmake and biicode configuration --- biicode/cmake/biicode.cmake | 5 ++--- cmake/DefinePlatformSpecifc.cmake | 8 +++----- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/biicode/cmake/biicode.cmake b/biicode/cmake/biicode.cmake index ab024352c..28a122dd9 100644 --- a/biicode/cmake/biicode.cmake +++ b/biicode/cmake/biicode.cmake @@ -24,12 +24,11 @@ endif(POCO_STATIC) # OS Detection 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) endif(WIN32) if (UNIX AND NOT ANDROID ) - target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_OS_FAMILY_UNIX ) # Standard 'must be' defines if (APPLE) target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64) @@ -81,4 +80,4 @@ find_package(APR) find_package(Apache2) if(APRUTIL_FOUND AND APACHE_FOUND) target_include_directories(${BII_BLOCK_TARGET} INTERFACE "${APACHE_INCLUDE_DIR}" "${APRUTIL_INCLUDE_DIR}" ) -endif(APRUTIL_FOUND AND APACHE_FOUND) \ No newline at end of file +endif(APRUTIL_FOUND AND APACHE_FOUND) diff --git a/cmake/DefinePlatformSpecifc.cmake b/cmake/DefinePlatformSpecifc.cmake index 369c472e2..379ea1b9c 100644 --- a/cmake/DefinePlatformSpecifc.cmake +++ b/cmake/DefinePlatformSpecifc.cmake @@ -40,11 +40,11 @@ if(MSVC) else(POCO_MT) set(STATIC_POSTFIX "md" CACHE STRING "Set static library postfix" FORCE) endif(POCO_MT) - + if (ENABLE_MSVC_MP) add_definitions(/MP) endif() - + else(MSVC) # Other compilers then MSVC don't have a static STATIC_POSTFIX at the moment set(STATIC_POSTFIX "" CACHE STRING "Set static library postfix" FORCE) @@ -69,11 +69,10 @@ include(CheckTypeSize) find_package(Cygwin) 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) if (UNIX AND NOT ANDROID ) - add_definitions( -DPOCO_OS_FAMILY_UNIX ) # Standard 'must be' defines if (APPLE) add_definitions( -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64) @@ -85,7 +84,6 @@ if (UNIX AND NOT ANDROID ) endif(UNIX AND NOT ANDROID ) if (CMAKE_SYSTEM MATCHES "SunOS") - add_definitions( -DPOCO_OS_FAMILY_UNIX ) # Standard 'must be' defines 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)