Don't try to build tests if BUILD_TESTING is off

29137fd3 · Peter Eastman · dc474876 · 29137fd3 · 29137fd3
Commit 29137fd3 authored Sep 30, 2015 by Peter Eastman
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

platforms/cuda/CMakeLists.txt platforms/cuda/CMakeLists.txt +2 -2

platforms/opencl/CMakeLists.txt platforms/opencl/CMakeLists.txt +2 -2

No files found.
--- a/platforms/cuda/CMakeLists.txt
+++ b/platforms/cuda/CMakeLists.txt
@@ -13,9 +13,9 @@
 #----------------------------------------------------

 set(OPENMM_BUILD_CUDA_TESTS TRUE CACHE BOOL "Whether to build CUDA test cases")
-if(OPENMM_BUILD_CUDA_TESTS)
+if(BUILD_TESTING AND OPENMM_BUILD_CUDA_TESTS)
    SUBDIRS (tests)
-endif(OPENMM_BUILD_CUDA_TESTS)
+endif(BUILD_TESTING AND OPENMM_BUILD_CUDA_TESTS)

 # The source is organized into subdirectories, but we handle them all from
 # this CMakeLists file rather than letting CMake visit them as SUBDIRS.

--- a/platforms/opencl/CMakeLists.txt
+++ b/platforms/opencl/CMakeLists.txt
@@ -13,9 +13,9 @@
 #----------------------------------------------------

 set(OPENMM_BUILD_OPENCL_TESTS TRUE CACHE BOOL "Whether to build OpenCL test cases")
-if(OPENMM_BUILD_OPENCL_TESTS)
+if(BUILD_TESTING AND OPENMM_BUILD_OPENCL_TESTS)
    SUBDIRS (tests)
-endif(OPENMM_BUILD_OPENCL_TESTS)
+endif(BUILD_TESTING AND OPENMM_BUILD_OPENCL_TESTS)

 # The source is organized into subdirectories, but we handle them all from
 # this CMakeLists file rather than letting CMake visit them as SUBDIRS.