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 2015/07/06 19:21:55 UTC

[2/3] qpid-proton git commit: NO-JIRA: Don't run ruby tests if BUILD_RUBY is OFF.

NO-JIRA: Don't run ruby tests if BUILD_RUBY is OFF.


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

Branch: refs/heads/master
Commit: 6ba050afee4de25fb0c08fe7c57e0e21fd1bed42
Parents: 3c14a0d
Author: Alan Conway <ac...@redhat.com>
Authored: Mon Jun 22 15:16:11 2015 -0400
Committer: Alan Conway <ac...@redhat.com>
Committed: Mon Jul 6 12:17:33 2015 -0400

----------------------------------------------------------------------
 proton-c/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6ba050af/proton-c/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/CMakeLists.txt b/proton-c/CMakeLists.txt
index a1cf0e4..a3a98c2 100644
--- a/proton-c/CMakeLists.txt
+++ b/proton-c/CMakeLists.txt
@@ -535,7 +535,7 @@ if (BUILD_PYTHON)
 endif (BUILD_PYTHON)
 
 find_program(RUBY_EXE "ruby")
-if (RUBY_EXE)
+if (RUBY_EXE AND BUILD_RUBY)
   # ruby unit tests:  tests/ruby/proton-test
   # only enable the tests if the Ruby gem dependencies were found
   if (DEFAULT_RUBY_TESTING)
@@ -569,7 +569,7 @@ if (RUBY_EXE)
   endif (DEFAULT_RUBY_TESTING)
 else (RUBY_EXE)
   message (STATUS "Cannot find ruby, skipping ruby tests")
-endif (RUBY_EXE)
+endif()
 
 mark_as_advanced (RUBY_EXE RSPEC_EXE)
 


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