diff options
| author | Andrew Stitcher <astitcher@apache.org> | 2012-05-24 04:14:43 +0000 |
|---|---|---|
| committer | Andrew Stitcher <astitcher@apache.org> | 2012-05-24 04:14:43 +0000 |
| commit | e33e56e6fb2cc0cc50a9685031489dddb4718d14 (patch) | |
| tree | c74f920ab343c63aaa1c75018c9c2957788d12d9 /cpp | |
| parent | 985967e9cbea31050df52c09b4779671cf8da365 (diff) | |
| download | qpid-python-e33e56e6fb2cc0cc50a9685031489dddb4718d14.tar.gz | |
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/qpid@1342136 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/CMakeLists.txt | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt index 2ccb52e5de..21a96fcb14 100644 --- a/cpp/src/CMakeLists.txt +++ b/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 |