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 2017/10/19 12:40:21 UTC
[35/50] qpid-proton git commit: PROTON-1632: Split library versions
PROTON-1632: Split library versions
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/7c252e9c
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/7c252e9c
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/7c252e9c
Branch: refs/heads/go1
Commit: 7c252e9cbd1b7ff9f038ba96f8486b0d61de4298
Parents: 463aaf2
Author: Justin Ross <jr...@apache.org>
Authored: Sat Oct 14 16:56:03 2017 -0700
Committer: Justin Ross <jr...@apache.org>
Committed: Mon Oct 16 15:35:33 2017 -0700
----------------------------------------------------------------------
proton-c/CMakeLists.txt | 14 +++++++-------
proton-c/bindings/cpp/CMakeLists.txt | 4 ++--
proton-c/bindings/javascript/CMakeLists.txt | 4 ++--
proton-c/soversion.cmake | 2 --
proton-c/versions.cmake | 19 +++++++++++++++++++
5 files changed, 30 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7c252e9c/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index 6b6cfb4..e2c7b3d 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -20,7 +20,7 @@
include(CheckLibraryExists)
include(CheckSymbolExists)
-include(soversion.cmake)
+include(versions.cmake)
add_custom_target(docs)
add_custom_target(doc DEPENDS docs)
@@ -608,8 +608,8 @@ target_link_libraries (qpid-proton-core ${UUID_LIB} ${SSL_LIB} ${SASL_LIB} ${TIM
set_target_properties (
qpid-proton-core
PROPERTIES
- VERSION "${PN_LIB_SOMAJOR}.${PN_LIB_SOMINOR}"
- SOVERSION "${PN_LIB_SOMAJOR}"
+ VERSION "${PN_LIB_CORE_VERSION}"
+ SOVERSION "${PN_LIB_CORE_MAJOR_VERSION}"
LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
)
@@ -643,8 +643,8 @@ target_link_libraries (qpid-proton LINK_PRIVATE ${UUID_LIB} ${SSL_LIB} ${SASL_LI
set_target_properties (
qpid-proton
PROPERTIES
- VERSION "${PN_LIB_SOMAJOR}.${PN_LIB_SOMINOR}"
- SOVERSION "${PN_LIB_SOMAJOR}"
+ VERSION "${PN_LIB_LEGACY_VERSION}"
+ SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}"
LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
)
@@ -665,8 +665,8 @@ if (qpid-proton-proactor)
set_target_properties (
qpid-proton-proactor
PROPERTIES
- VERSION "${PN_LIB_SOMAJOR}.${PN_LIB_SOMINOR}"
- SOVERSION "${PN_LIB_SOMAJOR}"
+ VERSION "${PN_LIB_PROACTOR_VERSION}"
+ SOVERSION "${PN_LIB_PROACTOR_MAJOR_VERSION}"
LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
)
endif()
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7c252e9c/proton-c/bindings/cpp/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/cpp/CMakeLists.txt b/proton-c/bindings/cpp/CMakeLists.txt
index 33cbfa8..7961018 100644
--- a/proton-c/bindings/cpp/CMakeLists.txt
+++ b/proton-c/bindings/cpp/CMakeLists.txt
@@ -95,8 +95,8 @@ set_target_properties (
qpid-proton-cpp
PROPERTIES
LINKER_LANGUAGE CXX
- VERSION "${PN_LIB_SOMAJOR}.${PN_LIB_SOMINOR}"
- SOVERSION "${PN_LIB_SOMAJOR}"
+ VERSION "${PN_LIB_CPP_VERSION}"
+ SOVERSION "${PN_LIB_CPP_MAJOR_VERSION}"
LINK_FLAGS "${CATCH_UNDEFINED} ${LTO}"
)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7c252e9c/proton-c/bindings/javascript/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/javascript/CMakeLists.txt b/proton-c/bindings/javascript/CMakeLists.txt
index 971097c..c81a2ad 100644
--- a/proton-c/bindings/javascript/CMakeLists.txt
+++ b/proton-c/bindings/javascript/CMakeLists.txt
@@ -184,8 +184,8 @@ add_library(
set_target_properties(
qpid-proton-bitcode
PROPERTIES
- VERSION "${PN_LIB_SOMAJOR}.${PN_LIB_SOMINOR}"
- SOVERSION "${PN_LIB_SOMAJOR}"
+ VERSION "${PN_LIB_LEGACY_VERSION}"
+ SOVERSION "${PN_LIB_LEGACY_MAJOR_VERSION}"
LINK_FLAGS "${CATCH_UNDEFINED}"
)
target_link_libraries(qpid-proton-bitcode)
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7c252e9c/proton-c/soversion.cmake
----------------------------------------------------------------------
diff --git a/proton-c/soversion.cmake b/proton-c/soversion.cmake
deleted file mode 100644
index 665edca..0000000
--- a/proton-c/soversion.cmake
+++ /dev/null
@@ -1,2 +0,0 @@
-set (PN_LIB_SOMAJOR 11)
-set (PN_LIB_SOMINOR "0.0")
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7c252e9c/proton-c/versions.cmake
----------------------------------------------------------------------
diff --git a/proton-c/versions.cmake b/proton-c/versions.cmake
new file mode 100644
index 0000000..cfa7253
--- /dev/null
+++ b/proton-c/versions.cmake
@@ -0,0 +1,19 @@
+set(PN_LIB_CORE_MAJOR_VERSION 10)
+set(PN_LIB_CORE_MINOR_VERSION 1)
+set(PN_LIB_CORE_PATCH_VERSION 0)
+set(PN_LIB_CORE_VERSION "${PN_LIB_CORE_MAJOR_VERSION}.${PN_LIB_CORE_MINOR_VERSION}.${PN_LIB_CORE_PATCH_VERSION}")
+
+set(PN_LIB_PROACTOR_MAJOR_VERSION 1)
+set(PN_LIB_PROACTOR_MINOR_VERSION 0)
+set(PN_LIB_PROACTOR_PATCH_VERSION 0)
+set(PN_LIB_PROACTOR_VERSION "${PN_LIB_PROACTOR_MAJOR_VERSION}.${PN_LIB_PROACTOR_MINOR_VERSION}.${PN_LIB_PROACTOR_PATCH_VERSION}")
+
+set(PN_LIB_LEGACY_MAJOR_VERSION 11)
+set(PN_LIB_LEGACY_MINOR_VERSION 0)
+set(PN_LIB_LEGACY_PATCH_VERSION 0)
+set(PN_LIB_LEGACY_VERSION "${PN_LIB_LEGACY_MAJOR_VERSION}.${PN_LIB_LEGACY_MINOR_VERSION}.${PN_LIB_LEGACY_PATCH_VERSION}")
+
+set(PN_LIB_CPP_MAJOR_VERSION 11)
+set(PN_LIB_CPP_MINOR_VERSION 0)
+set(PN_LIB_CPP_PATCH_VERSION 0)
+set(PN_LIB_CPP_VERSION "${PN_LIB_CPP_MAJOR_VERSION}.${PN_LIB_CPP_MINOR_VERSION}.${PN_LIB_CPP_PATCH_VERSION}")
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org