[clfft] 56/107: build gtest only when BUILD_TEST is on

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Thu Jul 30 18:06:35 UTC 2015


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

ghisvail-guest pushed a commit to branch master
in repository clfft.

commit f48b9b62648f4d1e1a305f9189d561e4697d1e2a
Author: Gaëtan Lehmann <gaetan.lehmann at gmail.com>
Date:   Tue Mar 31 18:15:30 2015 +0200

    build gtest only when BUILD_TEST is on
---
 src/CMakeLists.txt | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 93e8220..7f4061e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -157,8 +157,6 @@ find_package( OpenCL )
 # This will define FFTW_FOUND
 find_package( FFTW )
 
-include(gtest.cmake)
-
 # Enable building of the clACML client if both requested and all dependencies are found
 if( BUILD_CLIENT AND Boost_FOUND )
 	set( FFT_CLIENT ON )
@@ -167,11 +165,12 @@ else( )
 endif( )
 
 # Enable building of the googletest unit test framework if requested and all dependencies are found
-if( BUILD_TEST AND GTEST_FOUND AND Boost_FOUND AND FFTW_FOUND )
+set( UNIT_TEST OFF )
+if( BUILD_TEST )
+    include(gtest.cmake)
+    if( GTEST_FOUND AND Boost_FOUND AND FFTW_FOUND )
 	set( UNIT_TEST ON )
-else( )
-	message( "GoogleTest unit testing will NOT be built" )
-	set( UNIT_TEST OFF )
+    endif( )
 endif( )
 
 # FFLAGS depend on the compiler, grab the compiler name from the path

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



More information about the debian-science-commits mailing list