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/05 15:32:39 UTC
svn commit: r1405807 - in /qpid/proton/trunk/proton-c: CMakeLists.txt
src/driver.c src/ssl/openssl.c src/ssl/ssl-internal.h src/ssl/ssl_stub.c
Author: astitcher
Date: Mon Nov 5 14:32:38 2012
New Revision: 1405807
URL: http://svn.apache.org/viewvc?rev=1405807&view=rev
Log:
Rearranged the build system to compile core library and platform
dependent files with different language settings.
- The core files need to be portable "pure" C whereas the platform
dependent files don't - they can use platform specific compiler options
- Removed some now unnecessary #defines; this helps compilation on BSDs.
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/src/driver.c
qpid/proton/trunk/proton-c/src/ssl/openssl.c
qpid/proton/trunk/proton-c/src/ssl/ssl-internal.h
qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1405807&r1=1405806&r2=1405807&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Mon Nov 5 14:32:38 2012
@@ -59,8 +59,6 @@ else()
add_custom_target(docs)
endif()
-set (PN_COMPILE_FLAGS "-Wall -Werror -pedantic-errors -std=c99")
-
# Set the default SSL/TLS implementation
find_package(OpenSSL)
@@ -110,14 +108,16 @@ add_subdirectory(examples/messenger/c)
# in lieu of doing this set the library name directly.
set (UUID_LIB uuid)
+set (COMPILE_WARNING_FLAGS "-Wall -Werror -pedantic-errors")
+set (COMPILE_LANGUAGE_FLAGS "-std=c99")
+set (COMPILE_PLATFORM_FLAGS "-std=gnu99")
+
set (qpid-proton-platform
src/driver.c
${pn_driver_ssl_impl}
)
-add_library (
- qpid-proton SHARED
-
+set (qpid-proton-core
src/util.c
src/error.c
src/buffer.c
@@ -136,31 +136,48 @@ add_library (
src/messenger.c
- ${qpid-proton-platform}
-
${PROJECT_BINARY_DIR}/encodings.h
${PROJECT_BINARY_DIR}/protocol.h
)
-target_link_libraries (qpid-proton ${UUID_LIB} ${SSL_LIB})
-add_executable (proton src/proton.c)
-target_link_libraries (proton qpid-proton)
+set_source_files_properties (
+ ${qpid-proton-core}
+ PROPERTIES
+ COMPILE_FLAGS "${COMPILE_WARNING_FLAGS} ${COMPILE_LANGUAGE_FLAGS}"
+)
-add_executable (proton-dump src/proton-dump.c)
-target_link_libraries (proton-dump qpid-proton)
+set_source_files_properties (
+ ${qpid-proton-platform}
+ PROPERTIES
+ COMPILE_FLAGS "${COMPILE_WARNING_FLAGS} ${COMPILE_PLATFORM_FLAGS}"
+)
+
+add_library (
+ qpid-proton SHARED
+
+ ${qpid-proton-core}
+ ${qpid-proton-platform}
+)
+
+target_link_libraries (qpid-proton ${UUID_LIB} ${SSL_LIB})
set_target_properties (
qpid-proton
PROPERTIES
- COMPILE_FLAGS "${PN_COMPILE_FLAGS}"
VERSION "${PN_LIB_SOMAJOR}.${PN_LIB_SOMINOR}"
SOVERSION "${PN_LIB_SOMAJOR}"
)
+add_executable (proton src/proton.c)
+target_link_libraries (proton qpid-proton)
+
+add_executable (proton-dump src/proton-dump.c)
+target_link_libraries (proton-dump qpid-proton)
+
set_target_properties (
- proton proton-dump
- PROPERTIES
- COMPILE_FLAGS "${PN_COMPILE_FLAGS}"
+ proton proton-dump
+ PROPERTIES
+ COMPILE_FLAGS "${COMPILE_WARNING_FLAGS} ${COMPILE_LANGUAGE_FLAGS}"
)
# Install executables and libraries
Modified: qpid/proton/trunk/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/driver.c?rev=1405807&r1=1405806&r2=1405807&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/driver.c (original)
+++ qpid/proton/trunk/proton-c/src/driver.c Mon Nov 5 14:32:38 2012
@@ -19,8 +19,6 @@
*
*/
-#define _POSIX_C_SOURCE 1
-
#include <assert.h>
#include <poll.h>
#include <stdio.h>
Modified: qpid/proton/trunk/proton-c/src/ssl/openssl.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/openssl.c?rev=1405807&r1=1405806&r2=1405807&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/openssl.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/openssl.c Mon Nov 5 14:32:38 2012
@@ -19,8 +19,6 @@
*
*/
-#define _POSIX_C_SOURCE 1
-
#include <proton/ssl.h>
#include "./ssl-internal.h"
#include <proton/engine.h>
Modified: qpid/proton/trunk/proton-c/src/ssl/ssl-internal.h
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/ssl-internal.h?rev=1405807&r1=1405806&r2=1405807&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/ssl-internal.h (original)
+++ qpid/proton/trunk/proton-c/src/ssl/ssl-internal.h Mon Nov 5 14:32:38 2012
@@ -21,10 +21,6 @@
*
*/
-#ifndef _POSIX_C_SOURCE
-#define _POSIX_C_SOURCE 1
-#endif
-
#include <proton/driver.h>
/** @file
Modified: qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c?rev=1405807&r1=1405806&r2=1405807&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c (original)
+++ qpid/proton/trunk/proton-c/src/ssl/ssl_stub.c Mon Nov 5 14:32:38 2012
@@ -19,8 +19,6 @@
*
*/
-#define _POSIX_C_SOURCE 1
-
#include <proton/ssl.h>
#include "ssl-internal.h"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org