QPID-7629: Update build metadata for compiler and library changes
- Use CMake "SYSTEM" keyword when including headers for nss and sasl
- Set C++ standard for gcc to gnu++03 to avoid the torrent of
auto_ptr warnings on recend fedoras
Thanks to Chris Richardson for the patch!
diff --git a/CMakeLists.txt b/CMakeLists.txt
index beeeac8..eefeafd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -160,7 +160,7 @@
set (CATCH_UNDEFINED "")
endif (CMAKE_SYSTEM_NAME STREQUAL SunOS)
set (NOSTRICT_ALIASING "-fno-strict-aliasing")
- set (COMPILER_FLAGS "-fvisibility-inlines-hidden")
+ set (COMPILER_FLAGS "-fvisibility-inlines-hidden -std=gnu++03")
# 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
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7bc6f2c..6ee474f 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -371,7 +371,7 @@
qpid/sys/cyrus/CyrusSecurityLayer.h
qpid/sys/cyrus/CyrusSecurityLayer.cpp
)
- include_directories (${CYRUS_SASL_INCLUDE_DIR})
+ include_directories (SYSTEM ${CYRUS_SASL_INCLUDE_DIR})
set(sasl_LIB ${CYRUS_SASL_LIBRARY})
set(HAVE_SASL 1)
else (BUILD_SASL)
@@ -451,7 +451,7 @@
# Add include directories and link directories for NSS
# unfortunately this doesn't get done automatically for
# libraries detected by FindPkgConfig
- include_directories(${ssl_INCLUDES})
+ include_directories(SYSTEM ${ssl_INCLUDES})
link_directories(${ssl_LIBDIRS})
endif (BUILD_SSL)
