You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jr...@apache.org on 2017/10/27 14:16:54 UTC
[1/6] qpid-cpp git commit: QPID-7893: Improvements to initialzation
fixes from review
Repository: qpid-cpp
Updated Branches:
refs/heads/master fc377333e -> 278723507
QPID-7893: Improvements to initialzation fixes from review
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/27872350
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/27872350
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/27872350
Branch: refs/heads/master
Commit: 2787235079659126474e24c285823c69bb31119d
Parents: e2c8ff4
Author: Justin Ross <jr...@apache.org>
Authored: Wed Oct 11 16:07:46 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Oct 27 07:00:39 2017 -0700
----------------------------------------------------------------------
src/qpid/broker/Selector.cpp | 2 +-
src/qpid/broker/SelectorToken.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/27872350/src/qpid/broker/Selector.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/broker/Selector.cpp b/src/qpid/broker/Selector.cpp
index 8309aa7..c7fece7 100644
--- a/src/qpid/broker/Selector.cpp
+++ b/src/qpid/broker/Selector.cpp
@@ -108,7 +108,7 @@ MessageSelectorEnv::MessageSelectorEnv(const Message& m) :
const Value MessageSelectorEnv::specialValue(const string& id) const
{
- Value v = Value();
+ Value v;
// TODO: Just use a simple if chain for now - improve this later
if ( id=="delivery_mode" ) {
v = msg.getEncoding().isPersistent() ? PERSISTENT : NON_PERSISTENT;
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/27872350/src/qpid/broker/SelectorToken.h
----------------------------------------------------------------------
diff --git a/src/qpid/broker/SelectorToken.h b/src/qpid/broker/SelectorToken.h
index e9f7ce0..3a07587 100644
--- a/src/qpid/broker/SelectorToken.h
+++ b/src/qpid/broker/SelectorToken.h
@@ -70,7 +70,7 @@ struct Token {
std::string::const_iterator tokenStart;
Token() :
- type()
+ type(T_EOS)
{}
Token(TokenType t, const std::string& v) :
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[6/6] qpid-cpp git commit: QPID-7860: Fix swig deprecation warnings
Posted by jr...@apache.org.
QPID-7860: Fix swig deprecation warnings
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/2349e0b7
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/2349e0b7
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/2349e0b7
Branch: refs/heads/master
Commit: 2349e0b79c9204b5ed37ec2a1b44625e1c46cc6d
Parents: 3b78933
Author: Justin Ross <jr...@apache.org>
Authored: Thu Sep 21 17:09:37 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Oct 27 07:00:39 2017 -0700
----------------------------------------------------------------------
CMakeModules/FindSWIG.cmake | 43 ++++++++++++++++++++++++++++++++
bindings/qmf2/python/CMakeLists.txt | 2 +-
bindings/qmf2/ruby/CMakeLists.txt | 2 +-
bindings/qpid/perl/CMakeLists.txt | 2 +-
bindings/qpid/python/CMakeLists.txt | 2 +-
bindings/qpid/ruby/CMakeLists.txt | 2 +-
6 files changed, 48 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2349e0b7/CMakeModules/FindSWIG.cmake
----------------------------------------------------------------------
diff --git a/CMakeModules/FindSWIG.cmake b/CMakeModules/FindSWIG.cmake
new file mode 100644
index 0000000..979ebab
--- /dev/null
+++ b/CMakeModules/FindSWIG.cmake
@@ -0,0 +1,43 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+include(${CMAKE_ROOT}/Modules/FindSWIG.cmake)
+
+if (NOT COMMAND swig_add_library)
+ macro (SWIG_ADD_LIBRARY name)
+ set(options "")
+ set(oneValueArgs LANGUAGE TYPE)
+ set(multiValueArgs SOURCES)
+ cmake_parse_arguments(_SAM "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
+
+ if (NOT DEFINED _SAM_LANGUAGE)
+ message(FATAL_ERROR "SWIG_ADD_LIBRARY: Missing LANGUAGE argument")
+ endif ()
+
+ if (NOT DEFINED _SAM_SOURCES)
+ message(FATAL_ERROR "SWIG_ADD_LIBRARY: Missing SOURCES argument")
+ endif ()
+
+ if (DEFINED _SAM_TYPE AND NOT _SAM_LANGUAGE STREQUAL "module")
+ message(FATAL_ERROR "SWIG_ADD_LIBRARY: This fallback impl of swig_add_library supports the module type only")
+ endif ()
+
+ swig_add_module(${name} ${_SAM_LANGUAGE} ${_SAM_SOURCES})
+ endmacro ()
+endif (NOT COMMAND swig_add_library)
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2349e0b7/bindings/qmf2/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/qmf2/python/CMakeLists.txt b/bindings/qmf2/python/CMakeLists.txt
index 3acd583..2ab1d7d 100644
--- a/bindings/qmf2/python/CMakeLists.txt
+++ b/bindings/qmf2/python/CMakeLists.txt
@@ -32,7 +32,7 @@ list(APPEND SWIG_MODULE_cqmf2_EXTRA_DEPS
${CMAKE_SOURCE_DIR}/include/qmf/qmf2.i
${CMAKE_SOURCE_DIR}/include/qpid/swig_python_typemaps.i
)
-swig_add_module(cqmf2 python ${CMAKE_CURRENT_SOURCE_DIR}/cqmf2.i)
+swig_add_library(cqmf2 LANGUAGE python SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cqmf2.i)
swig_link_libraries(cqmf2 qmf2 qpidmessaging qpidtypes ${PYTHON_LIBRARIES})
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${NOSTRICT_ALIASING}")
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2349e0b7/bindings/qmf2/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/qmf2/ruby/CMakeLists.txt b/bindings/qmf2/ruby/CMakeLists.txt
index 74fe777..e167177 100644
--- a/bindings/qmf2/ruby/CMakeLists.txt
+++ b/bindings/qmf2/ruby/CMakeLists.txt
@@ -36,7 +36,7 @@ list(APPEND SWIG_MODULE_cqmf2_ruby_EXTRA_DEPS
${CMAKE_SOURCE_DIR}/include/qmf/qmf2.i
${CMAKE_SOURCE_DIR}/include/qpid/swig_ruby_typemaps.i
)
-swig_add_module(cqmf2_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
+swig_add_library(cqmf2_ruby LANGUAGE ruby SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqmf2_ruby qmf2 qpidmessaging qpidtypes ${RUBY_LIBRARY})
##----------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2349e0b7/bindings/qpid/perl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/qpid/perl/CMakeLists.txt b/bindings/qpid/perl/CMakeLists.txt
index 3c859d6..b71a545 100644
--- a/bindings/qpid/perl/CMakeLists.txt
+++ b/bindings/qpid/perl/CMakeLists.txt
@@ -28,7 +28,7 @@ list(APPEND SWIG_MODULE_cqpid_perl_EXTRA_DEPS
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/qpid/qpid.i
${CMAKE_CURRENT_SOURCE_DIR}/../../../include/qpid/swig_perl_typemaps.i
)
-swig_add_module(cqpid_perl perl ${CMAKE_CURRENT_SOURCE_DIR}/perl.i)
+swig_add_library(cqpid_perl LANGUAGE perl SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/perl.i)
swig_link_libraries(cqpid_perl qpidmessaging qpidtypes ${PERL_LIBRARY})
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${NOSTRICT_ALIASING}")
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2349e0b7/bindings/qpid/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/qpid/python/CMakeLists.txt b/bindings/qpid/python/CMakeLists.txt
index ac1998b..fc251ba 100644
--- a/bindings/qpid/python/CMakeLists.txt
+++ b/bindings/qpid/python/CMakeLists.txt
@@ -32,7 +32,7 @@ list(APPEND SWIG_MODULE_qpid_messaging_EXTRA_DEPS
${CMAKE_SOURCE_DIR}/include/qpid/qpid.i
${CMAKE_SOURCE_DIR}/include/qpid/swig_python_typemaps.i
)
-swig_add_module(qpid_messaging python ${CMAKE_CURRENT_SOURCE_DIR}/qpid_messaging.i)
+swig_add_library(qpid_messaging LANGUAGE python SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/qpid_messaging.i)
swig_link_libraries(qpid_messaging qpidmessaging qpidtypes ${PYTHON_LIBRARIES})
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${NOSTRICT_ALIASING}")
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/2349e0b7/bindings/qpid/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/qpid/ruby/CMakeLists.txt b/bindings/qpid/ruby/CMakeLists.txt
index c31b4d4..c0e9e62 100644
--- a/bindings/qpid/ruby/CMakeLists.txt
+++ b/bindings/qpid/ruby/CMakeLists.txt
@@ -45,7 +45,7 @@ list(APPEND SWIG_MODULE_cqpid_ruby_EXTRA_DEPS
${CMAKE_SOURCE_DIR}/include/qpid/qpid.i
${CMAKE_SOURCE_DIR}/include/qpid/swig_ruby_typemaps.i
)
-swig_add_module(cqpid_ruby ruby ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
+swig_add_library(cqpid_ruby LANGUAGE ruby SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/ruby.i)
swig_link_libraries(cqpid_ruby qpidmessaging qpidtypes ${RUBY_LIBRARY})
set_source_files_properties(${swig_generated_file_fullname} PROPERTIES COMPILE_FLAGS "${NOSTRICT_ALIASING}")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[5/6] qpid-cpp git commit: QPID-7936: Allow overriding Perl and Ruby
install prefixes
Posted by jr...@apache.org.
QPID-7936: Allow overriding Perl and Ruby install prefixes
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/e2c8ff45
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/e2c8ff45
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/e2c8ff45
Branch: refs/heads/master
Commit: e2c8ff452b6a0456f0ce12d94e9ce7143d212c57
Parents: bacf5be
Author: Justin Ross <jr...@apache.org>
Authored: Thu Sep 28 10:21:32 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Oct 27 07:00:39 2017 -0700
----------------------------------------------------------------------
bindings/CMakeLists.txt | 26 ++++++++++++++++----------
bindings/qpid/perl/CMakeLists.txt | 11 ++++++++---
bindings/qpid/ruby/CMakeLists.txt | 5 +++++
3 files changed, 29 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/e2c8ff45/bindings/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/CMakeLists.txt b/bindings/CMakeLists.txt
index 3c55871..0195eb2 100644
--- a/bindings/CMakeLists.txt
+++ b/bindings/CMakeLists.txt
@@ -123,22 +123,28 @@ if (SWIG_FOUND)
if (BUILD_BINDING_RUBY)
message(STATUS "Building Ruby bindings")
- execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['prefix']"
- OUTPUT_VARIABLE RUBY_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR ${RUBY_SITEARCH_DIR})
-# string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR ${RUBY_ARCH_DIR})
+ if (NOT RUBY_PFX_ARCH_DIR)
+ execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['prefix']"
+ OUTPUT_VARIABLE RUBY_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ string(REPLACE ${RUBY_PREFIX} ${CMAKE_INSTALL_PREFIX} RUBY_PFX_ARCH_DIR ${RUBY_SITEARCH_DIR})
+ endif (NOT RUBY_PFX_ARCH_DIR)
+
add_subdirectory(qpid/ruby)
add_subdirectory(qmf2/ruby)
endif (BUILD_BINDING_RUBY)
if (BUILD_BINDING_PERL)
message(STATUS "Building Perl bindings")
- execute_process(COMMAND ${PERL_EXECUTABLE} "-V::prefix:"
- OUTPUT_VARIABLE QPERL_PREFIX
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- string(REGEX REPLACE "'(.*)'" "\\1" PERL_PREFIX ${QPERL_PREFIX})
- string(REPLACE ${PERL_PREFIX} ${CMAKE_INSTALL_PREFIX} PERL_PFX_ARCHLIB ${PERL_ARCHLIB})
+ if (NOT PERL_PFX_ARCHLIB)
+ execute_process(COMMAND ${PERL_EXECUTABLE} "-V::prefix:"
+ OUTPUT_VARIABLE QPERL_PREFIX
+ OUTPUT_STRIP_TRAILING_WHITESPACE)
+ string(REGEX REPLACE "'(.*)'" "\\1" PERL_PREFIX ${QPERL_PREFIX})
+ string(REPLACE ${PERL_PREFIX} ${CMAKE_INSTALL_PREFIX} PERL_PFX_ARCHLIB ${PERL_ARCHLIB})
+ else (NOT PERL_PFX_ARCHLIB)
+ message(STATUS "*** Using Perl language directory: ${PERL_PFX_ARCHLIB}")
+ endif (NOT PERL_PFX_ARCHLIB)
add_subdirectory(qpid/perl)
endif (BUILD_BINDING_PERL)
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/e2c8ff45/bindings/qpid/perl/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/qpid/perl/CMakeLists.txt b/bindings/qpid/perl/CMakeLists.txt
index b71a545..f4f1112 100644
--- a/bindings/qpid/perl/CMakeLists.txt
+++ b/bindings/qpid/perl/CMakeLists.txt
@@ -43,13 +43,18 @@ include_directories(${PERL_INCLUDE_PATH}
# it's coming from a version of Cmake < 2.8
install(TARGETS ${SWIG_MODULE_cqpid_perl_REAL_NAME}
RENAME cqpid_perl.so
- DESTINATION ${PERL_PFX_ARCHLIB}
+ DESTINATION ${PERL_PFX_ARCHLIB}/auto/cqpid_perl
COMPONENT ${QPID_COMPONENT_CLIENT}
)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cqpid_perl.pm
- ${CMAKE_CURRENT_SOURCE_DIR}/LICENSE
- ${CMAKE_CURRENT_SOURCE_DIR}/Makefile.PL
+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/qpid_messaging.pm
+ ${CMAKE_CURRENT_SOURCE_DIR}/lib/qpid.pm
DESTINATION ${PERL_PFX_ARCHLIB}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
+
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/qpid
+ DESTINATION ${PERL_PFX_ARCHLIB}
+ COMPONENT ${QPID_COMPONENT_CLIENT}
+ )
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/e2c8ff45/bindings/qpid/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/bindings/qpid/ruby/CMakeLists.txt b/bindings/qpid/ruby/CMakeLists.txt
index c0e9e62..4ce3888 100644
--- a/bindings/qpid/ruby/CMakeLists.txt
+++ b/bindings/qpid/ruby/CMakeLists.txt
@@ -59,6 +59,11 @@ install(TARGETS ${SWIG_MODULE_cqpid_ruby_REAL_NAME}
COMPONENT ${QPID_COMPONENT_CLIENT}
)
+install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib
+ DESTINATION ${RUBY_PFX_ARCH_DIR}
+ COMPONENT ${QPID_COMPONENT_CLIENT}
+ )
+
add_custom_command(OUTPUT ${GEM_BINDINGS_SOURCE_FILE}
COMMAND cp ${swig_generated_file_fullname} ${GEM_BINDINGS_SOURCE_FILE}
DEPENDS ${swig_generated_file_fullname}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[3/6] qpid-cpp git commit: QPID-7893: Dubious fixes for
initialization warnings
Posted by jr...@apache.org.
QPID-7893: Dubious fixes for initialization warnings
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/c5363a48
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/c5363a48
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/c5363a48
Branch: refs/heads/master
Commit: c5363a48acc43949e74ae8d85a20858d2313de11
Parents: fc37733
Author: Justin Ross <jr...@apache.org>
Authored: Wed Sep 20 16:11:58 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Oct 27 07:00:39 2017 -0700
----------------------------------------------------------------------
src/qpid/broker/Selector.cpp | 4 +---
src/qpid/broker/SelectorExpression.cpp | 2 +-
src/qpid/broker/SelectorToken.h | 3 ++-
3 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/c5363a48/src/qpid/broker/Selector.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/broker/Selector.cpp b/src/qpid/broker/Selector.cpp
index bf30df5..8309aa7 100644
--- a/src/qpid/broker/Selector.cpp
+++ b/src/qpid/broker/Selector.cpp
@@ -108,7 +108,7 @@ MessageSelectorEnv::MessageSelectorEnv(const Message& m) :
const Value MessageSelectorEnv::specialValue(const string& id) const
{
- Value v;
+ Value v = Value();
// TODO: Just use a simple if chain for now - improve this later
if ( id=="delivery_mode" ) {
v = msg.getEncoding().isPersistent() ? PERSISTENT : NON_PERSISTENT;
@@ -165,8 +165,6 @@ const Value MessageSelectorEnv::specialValue(const string& id) const
returnedStrings.push_back(new string(jmsType));
v = returnedStrings[returnedStrings.size()-1];
}
- } else {
- v = Value();
}
return v;
}
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/c5363a48/src/qpid/broker/SelectorExpression.cpp
----------------------------------------------------------------------
diff --git a/src/qpid/broker/SelectorExpression.cpp b/src/qpid/broker/SelectorExpression.cpp
index 1f21614..1b0afcb 100644
--- a/src/qpid/broker/SelectorExpression.cpp
+++ b/src/qpid/broker/SelectorExpression.cpp
@@ -1036,7 +1036,7 @@ Expression* unaryArithExpression(Tokeniser& tokeniser)
Expression* parseExactNumeric(const Token& token, bool negate)
{
int base = 0;
- string s;
+ string s("");
std::remove_copy(token.val.begin(), token.val.end(), std::back_inserter(s), '_');
if (s[1]=='b' || s[1]=='B') {
base = 2;
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/c5363a48/src/qpid/broker/SelectorToken.h
----------------------------------------------------------------------
diff --git a/src/qpid/broker/SelectorToken.h b/src/qpid/broker/SelectorToken.h
index bd60b69..e9f7ce0 100644
--- a/src/qpid/broker/SelectorToken.h
+++ b/src/qpid/broker/SelectorToken.h
@@ -69,7 +69,8 @@ struct Token {
std::string val;
std::string::const_iterator tokenStart;
- Token()
+ Token() :
+ type()
{}
Token(TokenType t, const std::string& v) :
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[4/6] qpid-cpp git commit: QPID-7713: The proximate fix for the clang
linking problem
Posted by jr...@apache.org.
QPID-7713: The proximate fix for the clang linking problem
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/3b789332
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/3b789332
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/3b789332
Branch: refs/heads/master
Commit: 3b789332cc5ca02a7bddee04751b8f229d4603a5
Parents: c5363a4
Author: Justin Ross <jr...@apache.org>
Authored: Thu Sep 21 16:46:55 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Oct 27 07:00:39 2017 -0700
----------------------------------------------------------------------
src/tests/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/3b789332/src/tests/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index 546374e..5c4ba79 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -213,7 +213,8 @@ add_executable (unit_test unit_test
${actual_unit_tests} ${platform_test_additions})
target_link_libraries (unit_test
${qpid_test_boost_libs}
- qpidmessaging qpidtypes qpidbroker qpidclient qpidcommon)
+ qpidmessaging qpidtypes qpidbroker qpidclient qpidcommon
+ pthread)
endif (BUILD_TESTING_UNITTESTS)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/6] qpid-cpp git commit: QPID-7920: Increment the max safe proton
version
Posted by jr...@apache.org.
QPID-7920: Increment the max safe proton version
Project: http://git-wip-us.apache.org/repos/asf/qpid-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-cpp/commit/bacf5bee
Tree: http://git-wip-us.apache.org/repos/asf/qpid-cpp/tree/bacf5bee
Diff: http://git-wip-us.apache.org/repos/asf/qpid-cpp/diff/bacf5bee
Branch: refs/heads/master
Commit: bacf5bee03665a7009ba824b65f5d9dc60547a78
Parents: 2349e0b
Author: Justin Ross <jr...@apache.org>
Authored: Thu Sep 21 17:24:38 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Fri Oct 27 07:00:39 2017 -0700
----------------------------------------------------------------------
src/amqp.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-cpp/blob/bacf5bee/src/amqp.cmake
----------------------------------------------------------------------
diff --git a/src/amqp.cmake b/src/amqp.cmake
index 194f1d0..305bc9d 100644
--- a/src/amqp.cmake
+++ b/src/amqp.cmake
@@ -22,7 +22,7 @@
find_package(Proton 0.7)
set (amqp_default ${amqp_force})
-set (maximum_version 0.17)
+set (maximum_version 0.18)
if (Proton_FOUND)
if (Proton_VERSION VERSION_GREATER ${maximum_version})
message(WARNING "Qpid proton ${Proton_VERSION} is not a tested version and might not be compatible, ${maximum_version} is highest tested; build may not work")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org