You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2012/11/06 22:39:14 UTC
svn commit: r1406354 - in /qpid/trunk/qpid/cpp/src: CMakeLists.txt rdma.cmake
Author: astitcher
Date: Tue Nov 6 21:39:14 2012
New Revision: 1406354
URL: http://svn.apache.org/viewvc?rev=1406354&view=rev
Log:
NO-JIRA: Remove unnecessary gcc conditionals
Modified:
qpid/trunk/qpid/cpp/src/CMakeLists.txt
qpid/trunk/qpid/cpp/src/rdma.cmake
Modified: qpid/trunk/qpid/cpp/src/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/CMakeLists.txt?rev=1406354&r1=1406353&r2=1406354&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/CMakeLists.txt (original)
+++ qpid/trunk/qpid/cpp/src/CMakeLists.txt Tue Nov 6 21:39:14 2012
@@ -271,10 +271,10 @@ if (CMAKE_COMPILER_IS_GNUCXX)
set (WARNING_FLAGS
"-Werror -pedantic -Wall -Wextra -Wno-shadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Wno-system-headers -Woverloaded-virtual")
- set (GCC_CATCH_UNDEFINED "-Wl,--no-undefined")
+ set (CATCH_UNDEFINED "-Wl,--no-undefined")
# gcc on SunOS uses native linker whose "-z defs" is too fussy
if (CMAKE_SYSTEM_NAME STREQUAL SunOS)
- set (GCC_CATCH_UNDEFINED "")
+ set (CATCH_UNDEFINED "")
endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
set (COMPILER_FLAGS "-fvisibility-inlines-hidden")
set (HIDE_SYMBOL_FLAGS "-fvisibility=hidden")
@@ -283,6 +283,7 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
set (COMPILER_FLAGS "-library=stlport4 -mt")
set (WARNING_FLAGS "+w")
+ set (CATCH_UNDEFINED "")
set (HIDE_SYMBOL_FLAGS "")
endif (CMAKE_CXX_COMPILER_ID STREQUAL SunPro)
@@ -574,13 +575,10 @@ if (BUILD_XML)
qpid/xml/XmlExchange.cpp
qpid/xml/XmlExchange.h
qpid/xml/XmlExchangePlugin.cpp)
- set_target_properties (xml PROPERTIES PREFIX "")
target_link_libraries (xml xerces-c xqilla qpidbroker pthread)
- if (CMAKE_COMPILER_IS_GNUCXX)
- set_target_properties (xml PROPERTIES
- PREFIX ""
- LINK_FLAGS ${GCC_CATCH_UNDEFINED})
- endif (CMAKE_COMPILER_IS_GNUCXX)
+ set_target_properties (xml PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${CATCH_UNDEFINED}")
install (TARGETS xml
DESTINATION ${QPIDD_MODULE_DIR}
COMPONENT ${QPID_COMPONENT_BROKER})
@@ -613,13 +611,10 @@ if (BUILD_ACL)
# the qpidbroker platform-specific source list.
if (NOT CMAKE_SYSTEM_NAME STREQUAL Windows)
add_library (acl MODULE ${acl_SOURCES})
- set_target_properties (acl PROPERTIES PREFIX "")
target_link_libraries (acl qpidbroker ${Boost_PROGRAM_OPTIONS_LIBRARY})
- if (CMAKE_COMPILER_IS_GNUCXX)
- set_target_properties (acl PROPERTIES
- PREFIX ""
- LINK_FLAGS "${GCC_CATCH_UNDEFINED}")
- endif (CMAKE_COMPILER_IS_GNUCXX)
+ set_target_properties (acl PROPERTIES
+ PREFIX ""
+ LINK_FLAGS "${CATCH_UNDEFINED}")
install (TARGETS acl
DESTINATION ${QPIDD_MODULE_DIR}
COMPONENT ${QPID_COMPONENT_BROKER})
@@ -811,10 +806,8 @@ else (CMAKE_SYSTEM_NAME STREQUAL Windows
if (CMAKE_SYSTEM_NAME STREQUAL Linux)
add_definitions(-pthread)
set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pthread")
- if (CMAKE_COMPILER_IS_GNUCXX)
- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${GCC_CATCH_UNDEFINED} -pthread")
- set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
- endif (CMAKE_COMPILER_IS_GNUCXX)
+ set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CATCH_UNDEFINED} -pthread")
+ set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
# On Linux override memory status module
set (qpid_memstat_module
qpid/sys/posix/MemStat.cpp
Modified: qpid/trunk/qpid/cpp/src/rdma.cmake
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/rdma.cmake?rev=1406354&r1=1406353&r2=1406354&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/rdma.cmake (original)
+++ qpid/trunk/qpid/cpp/src/rdma.cmake Tue Nov 6 21:39:14 2012
@@ -64,11 +64,12 @@ if (BUILD_RDMA)
add_library (rdmawrap SHARED ${rdma_SOURCES})
target_link_libraries (rdmawrap qpidcommon rdmacm ibverbs)
- set_target_properties (rdmawrap PROPERTIES VERSION ${rdmawrap_version})
+ set_target_properties (rdmawrap PROPERTIES
+ LINK_FLAGS "${CATCH_UNDEFINED}"
+ VERSION ${rdmawrap_version})
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(rdmawrap PROPERTIES
- COMPILE_FLAGS -Wno-missing-field-initializers
- LINK_FLAGS ${GCC_CATCH_UNDEFINED})
+ COMPILE_FLAGS -Wno-missing-field-initializers)
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS rdmawrap
@@ -78,12 +79,12 @@ if (BUILD_RDMA)
add_library (rdma MODULE qpid/sys/RdmaIOPlugin.cpp)
target_link_libraries (rdma qpidbroker rdmawrap)
set_target_properties (rdma PROPERTIES
+ LINK_FLAGS "${CATCH_UNDEFINED}"
PREFIX "")
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(rdma PROPERTIES
- COMPILE_FLAGS -Wno-missing-field-initializers
- LINK_FLAGS ${GCC_CATCH_UNDEFINED})
+ COMPILE_FLAGS -Wno-missing-field-initializers)
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS rdma
@@ -93,12 +94,12 @@ if (BUILD_RDMA)
add_library (rdmaconnector MODULE qpid/client/RdmaConnector.cpp)
target_link_libraries (rdmaconnector qpidclient rdmawrap)
set_target_properties (rdmaconnector PROPERTIES
+ LINK_FLAGS "${CATCH_UNDEFINED}"
PREFIX "")
if (CMAKE_COMPILER_IS_GNUCXX)
set_target_properties(rdmaconnector PROPERTIES
- COMPILE_FLAGS -Wno-missing-field-initializers
- LINK_FLAGS ${GCC_CATCH_UNDEFINED})
+ COMPILE_FLAGS -Wno-missing-field-initializers)
endif (CMAKE_COMPILER_IS_GNUCXX)
install (TARGETS rdmaconnector
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org