[clblas] 117/125: build gtest only when BUILD_TEST is on

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Fri May 29 06:57:28 UTC 2015


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

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

commit 9542e1e7985ad71139d4507bdfeb0c0745be3666
Author: Gaëtan Lehmann <gaetan.lehmann at gmail.com>
Date:   Tue Mar 31 18:42:31 2015 +0200

    build gtest only when BUILD_TEST is on
---
 src/CMakeLists.txt          | 3 ---
 src/tests/CMakeLists.txt    | 3 +++
 src/{ => tests}/gtest.cmake | 0
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 6e2c9a9..126ce28 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -197,9 +197,6 @@ endif( )
 # This will define OPENCL_FOUND
 find_package( OpenCL )
 
-# Find Google Test package
-include(gtest.cmake)
-
 # Find Boost on the system, and configure the type of boost build we want
 set( Boost_USE_MULTITHREADED ON )
 set( Boost_USE_STATIC_LIBS   ON )
diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt
index e0ebede..5798f40 100644
--- a/src/tests/CMakeLists.txt
+++ b/src/tests/CMakeLists.txt
@@ -286,6 +286,9 @@ else( )
 	set( runtime.library "${runtime.library}/${CMAKE_SHARED_LIBRARY_PREFIX}clBLAS${CMAKE_SHARED_LIBRARY_SUFFIX}" )
 endif( )
 
+# Find Google Test package
+include(gtest.cmake)
+
 if( GTEST_FOUND )
     if( CORR_TEST_WITH_ACML AND ACML_FOUND )
 		include_directories(${OPENCL_INCLUDE_DIRS} ${GTEST_INCLUDE_DIRS}
diff --git a/src/gtest.cmake b/src/tests/gtest.cmake
similarity index 100%
rename from src/gtest.cmake
rename to src/tests/gtest.cmake

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



More information about the debian-science-commits mailing list