From c1a018a1fdcd0ea76c596f572ba9910b6613eb04 Mon Sep 17 00:00:00 2001 From: Richard Roberts Date: Sat, 8 Feb 2014 14:09:50 -0500 Subject: [PATCH] Made OpenMP check a little smarter - only is performed if MKL is found, to speed up cmake. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62160c6b5..337fd19a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -182,8 +182,8 @@ endif() ############################################################################### -# Find OpenMP -if(GTSAM_USE_EIGEN_MKL AND GTSAM_USE_EIGEN_MKL_OPENMP) +# Find OpenMP (if we're also using MKL) +if(GTSAM_USE_EIGEN_MKL AND GTSAM_USE_EIGEN_MKL_OPENMP AND GTSAM_USE_EIGEN_MKL) find_package(OpenMP) if(OPENMP_FOUND AND GTSAM_USE_EIGEN_MKL AND GTSAM_WITH_EIGEN_MKL_OPENMP)