From 3588be16f39b5c0443cdb64a832cebe9c9f65b2e Mon Sep 17 00:00:00 2001 From: "Bryan W. Weber" Date: Tue, 11 Jun 2019 17:10:56 -0400 Subject: [PATCH] CMake use Accelerate even if OpenMP is also used For samples, make sure that OpenMP and Accelerate are not exclusive options on macOS --- samples/cxx/SConscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/samples/cxx/SConscript b/samples/cxx/SConscript index 58451093f..0d859b87f 100644 --- a/samples/cxx/SConscript +++ b/samples/cxx/SConscript @@ -23,11 +23,12 @@ find_package(OpenMP REQUIRED) set(CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}) set(CMAKE_EXE_LINKER_FLAGS ${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}) """ - elif env["OS"] == "Darwin": - localenv["cmake_extra"] = "find_library(ACCELERATE_FRAMEWORK Accelerate)" else: localenv['cmake_extra'] = '' + if env["OS"] == "Darwin": + localenv["cmake_extra"] += "find_library(ACCELERATE_FRAMEWORK Accelerate)" + buildSample(localenv.Program, pjoin(subdir, name), mglob(localenv, subdir, *extensions), CPPPATH=['#include', env['boost_inc_dir']])