[Pkg-owncloud-commits] [owncloud-client] 53/332: CSync: Fix test compile

Sandro Knauß hefee-guest at moszumanska.debian.org
Thu Aug 14 21:06:37 UTC 2014


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 34b31c01461dfb4f5a12b6938394823a653e9600
Author: Markus Goetz <markus at woboq.com>
Date:   Thu Jun 5 14:22:10 2014 +0200

    CSync: Fix test compile
    
    The previously applied pull request apparantly broke the compile
    because it re-ordered entries in the CMakeLists
---
 csync/CMakeLists.txt | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/csync/CMakeLists.txt b/csync/CMakeLists.txt
index a805044..7577257 100644
--- a/csync/CMakeLists.txt
+++ b/csync/CMakeLists.txt
@@ -28,14 +28,6 @@ if (NOT WIN32)
     find_package(Iconv)
 endif (NOT WIN32)
 
-if (UNIT_TESTING)
-    find_package(CMocka)
-    if (CMOCKA_FOUND)
-        include(AddCMockaTest)
-        add_subdirectory(tests)
-    endif (CMOCKA_FOUND)
-endif (UNIT_TESTING)
-
 include(ConfigureChecks.cmake)
 
 
@@ -51,6 +43,14 @@ endif (MEM_NULL_TESTS)
 
 add_subdirectory(src)
 
+if (UNIT_TESTING)
+    find_package(CMocka)
+    if (CMOCKA_FOUND)
+        include(AddCMockaTest)
+        add_subdirectory(tests)
+    endif (CMOCKA_FOUND)
+endif (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



More information about the Pkg-owncloud-commits mailing list