From 7ba9fbf154b2208ac2f0524def785c1044bd7ffc Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Thu, 24 May 2012 04:14:43 +0000 Subject: NO-JIRA: Rearrange CMake a bit to improve the chances of compiling on non-Linux Unix git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1342136 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/CMakeLists.txt | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'qpid/cpp/src') diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index 2ccb52e5de..21a96fcb14 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -784,10 +784,12 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) ) endif (POLLER STREQUAL poll) + # Set default System Info module + set (qpid_system_module + qpid/sys/posix/SystemInfo.cpp + ) + if (CMAKE_SYSTEM_NAME STREQUAL Linux) - set (qpid_system_module - qpid/sys/posix/SystemInfo.cpp - ) add_definitions(-pthread) set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread") if (CMAKE_COMPILER_IS_GNUCXX) @@ -795,13 +797,8 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) endif (CMAKE_COMPILER_IS_GNUCXX) endif (CMAKE_SYSTEM_NAME STREQUAL Linux) - set (qpidtypes_platform_SOURCES) - set (qpidtypes_platform_LIBS - uuid - ${Boost_SYSTEM_LIBRARY} - ) - if (CMAKE_SYSTEM_NAME STREQUAL SunOS) + # On Solaris override the system info module set (qpid_system_module qpid/sys/solaris/SystemInfo.cpp ) @@ -812,6 +809,12 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows) ) endif (CMAKE_SYSTEM_NAME STREQUAL SunOS) + set (qpidtypes_platform_SOURCES) + set (qpidtypes_platform_LIBS + uuid + ${Boost_SYSTEM_LIBRARY} + ) + set (qpidcommon_platform_SOURCES qpid/sys/posix/AsynchIO.cpp qpid/sys/posix/Fork.cpp -- cgit v1.2.1