You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2012/07/13 18:39:07 UTC
svn commit: r1361293 - in /qpid/proton/trunk/proton-c: CMakeLists.txt
bindings/CMakeLists.txt bindings/php/CMakeLists.txt
bindings/python/CMakeLists.txt
Author: rhs
Date: Fri Jul 13 16:39:07 2012
New Revision: 1361293
URL: http://svn.apache.org/viewvc?rev=1361293&view=rev
Log:
modified build to generate two libraries, libqpid-proton and libqpid-proton-posix
Modified:
qpid/proton/trunk/proton-c/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt
qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
Modified: qpid/proton/trunk/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/CMakeLists.txt?rev=1361293&r1=1361292&r2=1361293&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/CMakeLists.txt Fri Jul 13 16:39:07 2012
@@ -27,10 +27,9 @@ add_custom_command (
)
add_library (
- qpidproton SHARED
+ qpid-proton SHARED
src/util.c
- src/driver.c
src/error.c
src/buffer.c
src/parser.c
@@ -48,7 +47,12 @@ add_library (
${PROJECT_BINARY_DIR}/encodings.h
${PROJECT_BINARY_DIR}/protocol.h
+)
+add_library (
+ qpid-proton-posix SHARED
+
+ src/driver.c
src/messenger.c
)
@@ -58,19 +62,19 @@ if (SWIG_FOUND)
endif (SWIG_FOUND)
add_executable (proton src/proton.c)
-target_link_libraries (proton qpidproton ${LINK_DEPS})
+target_link_libraries (proton qpid-proton qpid-proton-posix ${LINK_DEPS})
add_executable (proton-dump src/proton-dump.c)
-target_link_libraries (proton-dump qpidproton ${LINK_DEPS})
+target_link_libraries (proton-dump qpid-proton)
add_subdirectory(docs/api)
set_target_properties (
- qpidproton proton proton-dump
+ qpid-proton qpid-proton-posix proton proton-dump
PROPERTIES
COMPILE_FLAGS "-Wall -Werror -pedantic-errors -std=c99 -g -Iinclude -fPIC"
)
-install (TARGETS proton qpidproton
+install (TARGETS proton proton-dump qpid-proton qpid-proton-posix
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib)
Modified: qpid/proton/trunk/proton-c/bindings/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/CMakeLists.txt?rev=1361293&r1=1361292&r2=1361293&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/CMakeLists.txt Fri Jul 13 16:39:07 2012
@@ -19,6 +19,8 @@
include(UseSWIG)
+set (BINDING_DEPS qpid-proton qpid-proton-posix ${LINK_DEPS})
+
# Build wrapper for Python:
# @todo: conditionalize on whether python is available!
add_subdirectory(python)
@@ -31,4 +33,3 @@ FIND_PROGRAM(PHP_CONFIG_EXE php-config)
IF(PHP_CONFIG_EXE)
add_subdirectory(php)
ENDIF(PHP_CONFIG_EXE)
-
Modified: qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt?rev=1361293&r1=1361292&r2=1361293&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/php/CMakeLists.txt Fri Jul 13 16:39:07 2012
@@ -36,5 +36,5 @@ ELSE()
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/php.i PROPERTIES SWIG_FLAGS "-I${PROJECT_SOURCE_DIR}/include")
swig_add_module(cproton php ${CMAKE_CURRENT_SOURCE_DIR}/php.i)
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${PHP_INCLUDES}")
- swig_link_libraries(cproton qpidproton ${LINK_DEPS})
+ swig_link_libraries(cproton ${BINDING_DEPS})
ENDIF()
Modified: qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt?rev=1361293&r1=1361292&r2=1361293&view=diff
==============================================================================
--- qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt (original)
+++ qpid/proton/trunk/proton-c/bindings/python/CMakeLists.txt Fri Jul 13 16:39:07 2012
@@ -4,4 +4,4 @@ set(CMAKE_SWIG_FLAGS "-threads")
swig_add_module(cproton python python.i)
include_directories (${PYTHON_INCLUDE_PATH})
-swig_link_libraries(cproton qpidproton ${LINK_DEPS} ${PYTHON_LIBRARIES})
+swig_link_libraries(cproton ${BINDING_DEPS} ${PYTHON_LIBRARIES})
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org