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 2017/11/10 03:17:47 UTC
[1/2] qpid-proton git commit: PROTON-1684: Adjust cmake for minimum
version of 2.8.12.2
Repository: qpid-proton
Updated Branches:
refs/heads/master 04563baa5 -> 463c94875
PROTON-1684: Adjust cmake for minimum version of 2.8.12.2
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/e38726d5
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/e38726d5
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/e38726d5
Branch: refs/heads/master
Commit: e38726d585cc8d9f9da2bfaec794addeb0e7699b
Parents: 04563ba
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Nov 3 12:19:11 2017 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 9 22:15:27 2017 -0500
----------------------------------------------------------------------
CMakeLists.txt | 2 +-
examples/c/CMakeLists.txt | 2 +-
examples/cpp/CMakeLists.txt | 2 +-
proton-c/bindings/cpp/CMakeLists.txt | 2 ++
proton-c/bindings/node/CMakeLists.txt | 2 +-
5 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e38726d5/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 06bc62b..0b1e7a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required (VERSION 2.8.7)
+cmake_minimum_required (VERSION 2.8.12)
project (Proton C)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e38726d5/examples/c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
index 894f1d8..acba229 100644
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required (VERSION 2.8.7)
+cmake_minimum_required (VERSION 2.8.12)
find_package(Proton REQUIRED Core Proactor)
set(CMAKE_THREAD_PREFER_PTHREAD TRUE)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e38726d5/examples/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/examples/cpp/CMakeLists.txt b/examples/cpp/CMakeLists.txt
index 018a03e..0531aec 100644
--- a/examples/cpp/CMakeLists.txt
+++ b/examples/cpp/CMakeLists.txt
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required (VERSION 2.8.7)
+cmake_minimum_required (VERSION 2.8.12)
enable_language(CXX)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e38726d5/proton-c/bindings/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt
index 06a7ee1..a7c2866 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -16,6 +16,8 @@
# specific language governing permissions and limitations
# under the License.
#
+cmake_minimum_required(VERSION 2.8.12)
+
enable_language(CXX)
set (BUILD_CPP_03 OFF CACHE BOOL "Compile the C++ binding as C++03 even when C++11 is available")
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/e38726d5/proton-c/bindings/node/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/node/CMakeLists.txt b/proton-c/bindings/node/CMakeLists.txt
index 333cfd7..d70ab1f 100644
--- a/proton-c/bindings/node/CMakeLists.txt
+++ b/proton-c/bindings/node/CMakeLists.txt
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
#
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.12)
if (NOT BUILD_WITH_CXX)
message(FATAL_ERROR "ERROR: node bindings require CXX build to be enabled.\n"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org
[2/2] qpid-proton git commit: PROTON-1684: Remove build logic
specific for gcc 4.3 and earlier - We now only support gcc 4.4.7 and later
Posted by as...@apache.org.
PROTON-1684: Remove build logic specific for gcc 4.3 and earlier
- We now only support gcc 4.4.7 and later
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/463c9487
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/463c9487
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/463c9487
Branch: refs/heads/master
Commit: 463c948753d17474fc4308bd4d49610e6cb5c459
Parents: e38726d
Author: Andrew Stitcher <as...@apache.org>
Authored: Fri Nov 3 16:18:04 2017 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 9 22:16:20 2017 -0500
----------------------------------------------------------------------
proton-c/CMakeLists.txt | 11 +----------
1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/463c9487/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 3f79af6..db0a037 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -232,18 +232,9 @@ if (CMAKE_COMPILER_IS_GNUCC)
# C++ allow "%z" format specifier and variadic macros
set (CXX_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wno-format -Wno-variadic-macros")
if (NOT BUILD_WITH_CXX)
- set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wstrict-prototypes")
+ set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wstrict-prototypes -Wc++-compat -Wvla -Wsign-compare -Wwrite-strings")
set (COMPILE_LANGUAGE_FLAGS "-std=c99")
set (COMPILE_PLATFORM_FLAGS "-std=gnu99")
-
- execute_process(COMMAND ${CMAKE_C_COMPILER} ${CMAKE_C_COMPILER_ARG1} ${CMAKE_C_COMPILER_ARG2} -dumpversion OUTPUT_VARIABLE GCC_VERSION
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if (${GCC_VERSION} VERSION_LESS "4.3.0")
- # Only a concern if contibuting code back.
- message (STATUS "Old gcc version detected. C++ compatibility checks disabled")
- else (${GCC_VERSION} VERSION_LESS "4.3.0")
- set (COMPILE_WARNING_FLAGS "${COMPILE_WARNING_FLAGS} -Wc++-compat -Wvla -Wsign-compare -Wwrite-strings")
- endif (${GCC_VERSION} VERSION_LESS "4.3.0")
else (NOT BUILD_WITH_CXX)
set (COMPILE_WARNING_FLAGS "${CXX_WARNING_FLAGS}")
endif (NOT BUILD_WITH_CXX)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org