diff options
Diffstat (limited to 'qpid/cpp/src/CMakeLists.txt')
| -rw-r--r-- | qpid/cpp/src/CMakeLists.txt | 96 |
1 files changed, 2 insertions, 94 deletions
diff --git a/qpid/cpp/src/CMakeLists.txt b/qpid/cpp/src/CMakeLists.txt index bdbef85f9a..7325e86f92 100644 --- a/qpid/cpp/src/CMakeLists.txt +++ b/qpid/cpp/src/CMakeLists.txt @@ -154,92 +154,6 @@ if (VALGRIND_FOUND) option(ENABLE_VALGRIND "Use valgrind to detect run-time problems" ON) endif (VALGRIND_FOUND) -# Do not keep on linking against transitive library dependencies -# TODO Need to rework CMake files to use INTERFACE_LINK_LIBRARIES target property -# When that is done we can remove the next 4 lines completely -set (CMAKE_LINK_INTERFACE_LIBRARIES "") -if (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS "2.8.12") - cmake_policy(SET CMP0022 OLD) -endif (DEFINED CMAKE_VERSION AND NOT CMAKE_VERSION VERSION_LESS "2.8.12") - -if (CMAKE_COMPILER_IS_GNUCXX) - # Warnings: Enable as many as possible, keep the code clean. Please - # do not disable warnings or remove -Werror without discussing on - # qpid-dev list. - # - # The following warnings are deliberately omitted, they warn on valid code. - # -Wunreachable-code -Wpadded -Winline - # -Wshadow - warns about boost headers. - 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 (CATCH_UNDEFINED "-Wl,--no-undefined") - # gcc on SunOS uses native linker whose "-z defs" is too fussy - if (CMAKE_SYSTEM_NAME STREQUAL SunOS) - set (CATCH_UNDEFINED "") - endif (CMAKE_SYSTEM_NAME STREQUAL SunOS) - set (COMPILER_FLAGS "-fvisibility-inlines-hidden") - # gcc 4.1.2 on RHEL 5 needs -Wno-attributes to avoid an error that's fixed - # in later gcc versions. - execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion - OUTPUT_VARIABLE GCC_VERSION) - if (GCC_VERSION VERSION_EQUAL 4.1.2) - message (STATUS "Cannot restrict library symbol export on gcc 4.1.2") - set (HIDE_SYMBOL_FLAGS "-fno-visibility-inlines-hidden") - else (GCC_VERSION VERSION_EQUAL 4.1.2) - set (HIDE_SYMBOL_FLAGS "-fno-visibility-inlines-hidden -fvisibility=hidden") - set (QPID_LINKMAP ${CMAKE_CURRENT_SOURCE_DIR}/qpid.linkmap) - set (LINK_VERSION_SCRIPT_FLAG "-Wl,--version-script=${QPID_LINKMAP}") - endif (GCC_VERSION VERSION_EQUAL 4.1.2) -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) - -if (CMAKE_SYSTEM_NAME STREQUAL Windows) - # Allow MSVC user to select 'WinXP-SP3/Windows Server 2003' as build target version - set (win32_winnt_default OFF) - if (MSVC) - set (win32_winnt_default ON) - endif (MSVC) - option(SET_WIN32_WINNT "In Windows-MSVC build: define _WIN32_WINNT=0x0502 to select target version: Windows XP with SP3" ${win32_winnt_default}) -endif (CMAKE_SYSTEM_NAME STREQUAL Windows) - -if (MSVC) - add_definitions( - /D "_CRT_NONSTDC_NO_WARNINGS" - /D "NOMINMAX" - /D "WIN32_LEAN_AND_MEAN" - /wd4244 - /wd4800 - /wd4355 - /wd4267 - ) - - if (SET_WIN32_WINNT) - add_definitions(/D "_WIN32_WINNT=0x0502") - endif (SET_WIN32_WINNT) - - # set the RelWithDebInfo compile/link switches to equal Release - set (CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MD /O2 /Ob2 /D NDEBUG") - set (CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO "/debug /INCREMENTAL:NO") - - if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src) - # Set the windows version for the .NET Binding cpp project - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/org.apache.qpid.messaging.template.rc - ${CMAKE_CURRENT_BINARY_DIR}/windows/resources/org.apache.qpid.messaging.rc) - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/AssemblyInfo-template.cpp - ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/AssemblyInfo.cpp) - # Set the windows version for the .NET Binding sessionreceiver project - configure_file(${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src/sessionreceiver/properties/sessionreceiver-AssemblyInfo-template.cs - ${CMAKE_CURRENT_BINARY_DIR}/windows/generated_src/sessionreceiver-AssemblyInfo.cs) - endif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../bindings/qpid/dotnet/src) -endif (MSVC) - option(ENABLE_WARNINGS "Enable lots of compiler warnings (recommended)" ON) if (NOT ENABLE_WARNINGS) set (WARNING_FLAGS "") @@ -571,8 +485,7 @@ if (BUILD_XML) target_link_libraries (xml xerces-c xqilla qpidbroker qpidcommon) set_target_properties (xml PROPERTIES PREFIX "" - COMPILE_DEFINITIONS _IN_QPID_BROKER - LINK_FLAGS "${CATCH_UNDEFINED}") + COMPILE_DEFINITIONS _IN_QPID_BROKER) install (TARGETS xml DESTINATION ${QPIDD_MODULE_DIR} COMPONENT ${QPID_COMPONENT_BROKER}) @@ -666,8 +579,7 @@ if (BUILD_HA) ${Boost_PROGRAM_OPTIONS_LIBRARY}) set_target_properties (ha PROPERTIES PREFIX "" - COMPILE_DEFINITIONS _IN_QPID_BROKER - LINK_FLAGS "${CATCH_UNDEFINED}") + COMPILE_DEFINITIONS _IN_QPID_BROKER) install (TARGETS ha DESTINATION ${QPIDD_MODULE_DIR} COMPONENT ${QPID_COMPONENT_BROKER}) @@ -752,10 +664,6 @@ 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") - 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 |