summaryrefslogtreecommitdiff
path: root/qpid/cpp/src/CMakeLists.txt
diff options
context:
space:
mode:
authorClifford Allan Jansen <cliffjansen@apache.org>2012-06-17 23:57:36 +0000
committerClifford Allan Jansen <cliffjansen@apache.org>2012-06-17 23:57:36 +0000
commit25d7d586120db9696447be07d3aa9d80606f181b (patch)
treed5abd1922a82f276cf8c65b8595a88b6333650e9 /qpid/cpp/src/CMakeLists.txt
parent4d4dcd7558a7efc6fbca626f8e5195e6d7f858a2 (diff)
downloadqpid-python-25d7d586120db9696447be07d3aa9d80606f181b.tar.gz
QPID-4071: basic porting changes for solaris native compiler
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1351185 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
-rw-r--r--qpid/cpp/src/CMakeLists.txt8
1 files changed, 7 insertions, 1 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt
index e7090b74a0..9791c391fe 100644
--- a/qpid/cpp/src/CMakeLists.txt
+++ b/qpid/cpp/src/CMakeLists.txt
@@ -281,7 +281,7 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
set (COMPILER_FLAGS "-library=stlport4 -mt")
- set (WARNING_FLAGS "+w2")
+ set (WARNING_FLAGS "+w")
endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
option(ENABLE_WARNINGS "Enable lots of compiler warnings (recommended)" ON)
@@ -826,6 +826,12 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows)
)
endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
+ if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
+ # -lmalloc needed for mallinfo.
+ set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lmalloc")
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -lmalloc")
+ endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
+
set (qpidtypes_platform_SOURCES)
set (qpidtypes_platform_LIBS
uuid