[arrayfire] 120/248: Change condition when nonfree are removed from ctest

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch dfsg-clean
in repository arrayfire.

commit 91914929cbaea9af8db881170b2001f05bafcb1f
Author: Shehzan Mohammed <shehzan at arrayfire.com>
Date:   Mon Oct 12 15:17:25 2015 -0400

    Change condition when nonfree are removed from ctest
---
 test/CMakeLists.txt | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 0070830..aff4620 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,8 +12,10 @@ MACRO(CREATE_TESTS BACKEND LIBNAME GTEST_LIBS OTHER_LIBS)
         GET_FILENAME_COMPONENT(FNAME ${FILE} NAME_WE)
         SET(TEST_NAME ${FNAME}_${BACKEND})
 
-        IF ("${FILE}" MATCHES ".manual." OR "${FILE}" MATCHES ".nonfree.")
-          MESSAGE(STATUS "Removing ${FILE} from ctest")
+        IF(NOT ${BUILD_NONFREE} AND "${FILE}" MATCHES ".nonfree.")
+            MESSAGE(STATUS "Removing ${FILE} from ctest")
+        ELSEIF("${FILE}" MATCHES ".manual.")
+            MESSAGE(STATUS "Removing ${FILE} from ctest")
         ELSE()
           ADD_TEST(Test_${TEST_NAME} ${TEST_NAME})
         ENDIF()
@@ -117,9 +119,9 @@ ENDIF()
 
 IF(${BUILD_UNIFIED})
     MESSAGE(STATUS "TESTS: Unified backends is ON")
-	IF(WIN32)
+    IF(WIN32)
         CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" "")
-	ELSE()
-	    CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" dl)
-	ENDIF()
+    ELSE()
+        CREATE_TESTS(unified "" "${GTEST_LIBRARIES}" dl)
+    ENDIF()
 ENDIF()

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/arrayfire.git