From f0887a99e201cc8caca4694af28a60bb0b85bc41 Mon Sep 17 00:00:00 2001 From: Tony Date: Tue, 3 Jun 2014 21:29:54 +0100 Subject: [PATCH] On branch gtk3 Changes to be committed: modified: CMakeLists.txt Corrected merge error from last resync --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a741aac..081e5a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -923,11 +923,11 @@ endif(DEFINED WITH_INTELPERC) status("") status(" Other third-party libraries:") -if((WITH_IPP OR WITH_ICV) AND HAVE_IPP) +if(WITH_IPP AND HAVE_IPP) status(" Use IPP:" "${IPP_VERSION_STR} [${IPP_VERSION_MAJOR}.${IPP_VERSION_MINOR}.${IPP_VERSION_BUILD}]") status(" at:" "${IPP_ROOT_DIR}") else() - status(" Use IPP:" (WITH_IPP OR WITH_ICV) AND NOT HAVE_IPP THEN "IPP not found" ELSE NO) + status(" Use IPP:" WITH_IPP AND NOT HAVE_IPP THEN "IPP not found" ELSE NO) endif() if(DEFINED WITH_IPP_A) -- 2.7.4