qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject qpid-proton git commit: PROTON-1560: Rename BUILD_ONLY as BUILD_BINDINGS
Date Wed, 04 Oct 2017 22:00:23 GMT
Repository: qpid-proton
Updated Branches:
  refs/heads/master 714a8bd2e -> 7b4c09e65


PROTON-1560: Rename BUILD_ONLY as BUILD_BINDINGS

Name is clearer, also removed from cache as it is only relevant when creating the initial
cache.


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/7b4c09e6
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/7b4c09e6
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/7b4c09e6

Branch: refs/heads/master
Commit: 7b4c09e653687e928687aaf4b40e26447bd0df7c
Parents: 714a8bd
Author: Alan Conway <aconway@redhat.com>
Authored: Wed Oct 4 17:59:15 2017 -0400
Committer: Alan Conway <aconway@redhat.com>
Committed: Wed Oct 4 17:59:15 2017 -0400

----------------------------------------------------------------------
 proton-c/bindings/CMakeLists.txt   | 18 +++++++++++++-----
 proton-c/bindings/ruby/README.rdoc |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7b4c09e6/proton-c/bindings/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/CMakeLists.txt b/proton-c/bindings/CMakeLists.txt
index 7537406..a8dbe57 100644
--- a/proton-c/bindings/CMakeLists.txt
+++ b/proton-c/bindings/CMakeLists.txt
@@ -103,13 +103,21 @@ if(SWIG_FOUND)
 endif()
 
 
-set(BUILD_ONLY "${BINDINGS}" CACHE STRING
-  "Only bindings in this list are built by default. Explicit BUILD_XXX=ON settings take precendence")
+# To kick-start a build with just a few bindings enabled by default, e.g. ruby and go:
+#
+#     cmake -DBUILD_BINDINGS=ruby;go
+#
+# This is only used when CMakeCache.txt is first created, after that set the normal
+# BUILD_XXX variables to enable/disable bindings.
+#
+if (NOT DEFINED BUILD_BINDINGS)
+  set(BUILD_BINDINGS "${BINDINGS}")
+endif()
 
 foreach(BINDING ${BINDINGS})
   string(TOUPPER ${BINDING} UBINDING)
-  list(FIND BUILD_ONLY ${BINDING} N)
-  if(NOBUILD_${UBINDING} OR ( N EQUAL -1 ) ) # Over-ridden or not on the BUILD_ONLY list
+  list(FIND BUILD_BINDINGS ${BINDING} N)
+  if(NOBUILD_${UBINDING} OR ( N EQUAL -1 ) ) # Over-ridden or not on the BUILD_BINDINGS list
     set(DEFAULT_${UBINDING} OFF)
   endif()
   option(BUILD_${UBINDING} "Build ${BINDING} language binding" ${DEFAULT_${UBINDING}})
@@ -118,4 +126,4 @@ foreach(BINDING ${BINDINGS})
   endif ()
 endforeach(BINDING)
 
-unset(BUILD_ONLY)               # Only relevant to set initial defaults.
+unset(BUILD_BINDINGS CACHE) # Remove from cache, only relevant when creating the initial
cache.

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/7b4c09e6/proton-c/bindings/ruby/README.rdoc
----------------------------------------------------------------------
diff --git a/proton-c/bindings/ruby/README.rdoc b/proton-c/bindings/ruby/README.rdoc
index 0382231..566cb34 100644
--- a/proton-c/bindings/ruby/README.rdoc
+++ b/proton-c/bindings/ruby/README.rdoc
@@ -9,7 +9,7 @@ You can build clients and servers using this library.
 
 If you have the complete proton sources, you can build and install locally with:
 
-    cmake -DBUILD_ONLY=ruby && make install
+    cmake -DBUILD_BINDINGS=ruby && make install
 
 The cmake build also produces a Ruby Gem file at:
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message