[Pkg-owncloud-commits] [owncloud-client] 36/332: don't look for CMocka if we're not building unit tests

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 62ea6f316f334b3d0f77e26f87398f75e054115c
Author: Kuba Serafinowski <zizzfizzix at gmail.com>
Date:   Mon Jun 2 18:36:42 2014 +0300

    don't look for CMocka if we're not building unit tests
---
 csync/CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/csync/CMakeLists.txt b/csync/CMakeLists.txt
index 86b0d98..a805044 100644
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
@@ -27,10 +27,14 @@ include(MacroCopyFile)
 if (NOT WIN32)
     find_package(Iconv)
 endif (NOT WIN32)
-find_package(CMocka)
-if (CMOCKA_FOUND AND UNIT_TESTING)
-    include(AddCMockaTest)
-endif (CMOCKA_FOUND AND UNIT_TESTING)
+
+if (UNIT_TESTING)
+    find_package(CMocka)
+    if (CMOCKA_FOUND)
+        include(AddCMockaTest)
+        add_subdirectory(tests)
+    endif (CMOCKA_FOUND)
+endif (UNIT_TESTING)
 
 include(ConfigureChecks.cmake)
 
@@ -47,10 +51,6 @@ endif (MEM_NULL_TESTS)
 
 add_subdirectory(src)
 
-if (CMOCKA_FOUND AND UNIT_TESTING)
-    add_subdirectory(tests)
-endif (CMOCKA_FOUND AND UNIT_TESTING)
-
 configure_file(config_csync.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config_csync.h)
 configure_file(config_test.h.cmake  ${CMAKE_CURRENT_BINARY_DIR}/config_test.h)
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git