Author: astitcher
Date: Thu May 24 04:14:43 2012
New Revision: 1342136
URL: http://svn.apache.org/viewvc?rev=1342136&view=rev
Log:
NO-JIRA: Rearrange CMake a bit to improve the chances of compiling on non-Linux
Unix
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1342136&r1=1342135&r2=1342136&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Thu May 24 04:14:43 2012
@@ -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
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
