You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2018/11/02 20:46:35 UTC
[15/50] qpid-proton git commit: PROTON-1798: [cmake] string(APPEND)
is not available in CMake 2.8.12
PROTON-1798: [cmake] string(APPEND) is not available in CMake 2.8.12
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/7e3d648e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/7e3d648e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/7e3d648e
Branch: refs/heads/go1
Commit: 7e3d648e40e1baa76540f0a975bec929c5839350
Parents: f963e4f
Author: Alan Conway <ac...@redhat.com>
Authored: Wed Sep 12 10:30:19 2018 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Wed Sep 12 10:30:19 2018 -0400
----------------------------------------------------------------------
ruby/CMakeLists.txt | 4 ++--
tests/runtime_check.cmake | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7e3d648e/ruby/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/ruby/CMakeLists.txt b/ruby/CMakeLists.txt
index ca342dc..9accbe2 100644
--- a/ruby/CMakeLists.txt
+++ b/ruby/CMakeLists.txt
@@ -41,9 +41,9 @@ swig_link_libraries(cproton-ruby ${BINDING_DEPS} ${RUBY_LIBRARY})
if (RUBY_VERSION VERSION_LESS 1.9.0)
# Don't have blocking control API
elseif(RUBY_VERSION VERSION_LESS 2.0.0)
- string(APPEND CMAKE_C_FLAGS " -DRUBY_USE_rb_thread_blocking_region")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRUBY_USE_rb_thread_blocking_region")
else()
- string(APPEND CMAKE_C_FLAGS " -DRUBY_USE_rb_thread_call_without_gvl")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DRUBY_USE_rb_thread_call_without_gvl")
endif()
# Remove -fvisibility=hidden, it causes an obscure failure in release builds.
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7e3d648e/tests/runtime_check.cmake
----------------------------------------------------------------------
diff --git a/tests/runtime_check.cmake b/tests/runtime_check.cmake
index e1d76c3..c0b7191 100644
--- a/tests/runtime_check.cmake
+++ b/tests/runtime_check.cmake
@@ -110,8 +110,8 @@ endif()
if(SANITIZE_FLAGS)
set(ENABLE_UNDEFINED_ERROR OFF CACHE BOOL "Disabled for sanitizers" FORCE)
- string(APPEND CMAKE_C_FLAGS " ${SANITIZE_FLAGS}")
- string(APPEND CMAKE_CXX_FLAGS "${SANITIZE_FLAGS}")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SANITIZE_FLAGS}")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SANITIZE_FLAGS}")
endif()
if(TEST_EXE_PREFIX)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org