From 63a46d94ad340d6d526f687817119a13e7c9e40f Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Tue, 31 May 2016 11:59:32 -1000 Subject: [PATCH] Remove OpenMP option from Boo's soxr fork --- CMakeLists.txt | 1 - soxr/CMakeLists.txt | 17 ++++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1dc6ea9..f8d1ed9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,6 @@ endif() set(WITH_LSR_BINDINGS OFF) set(BUILD_TESTS OFF) -set(WITH_OPENMP OFF) set(BUILD_SHARED_LIBS OFF) set(SOXR_SILENT ON) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/soxr/cmake/Modules") diff --git a/soxr/CMakeLists.txt b/soxr/CMakeLists.txt index 7ebbb13..c9410a7 100644 --- a/soxr/CMakeLists.txt +++ b/soxr/CMakeLists.txt @@ -37,7 +37,6 @@ endif () #option (BUILD_TESTS "Build sanity-tests." ON) #option (BUILD_SHARED_LIBS "Build shared libraries." ON) #option (BUILD_EXAMPLES "Build examples." OFF) -option (WITH_OPENMP "Include OpenMP threading." ON) option (WITH_LSR_BINDINGS "Include a `libsamplerate'-like interface." ON) cmake_dependent_option (WITH_SINGLE_PRECISION "Build with single precision (for up to 20-bit accuracy)." ON "WITH_DOUBLE_PRECISION" ON) @@ -74,14 +73,14 @@ if (NEED_LIBM) link_libraries (m) endif () -if (WITH_OPENMP) - find_package (OpenMP) - if (OPENMP_FOUND) - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") - set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OpenMP_SHARED_LINKER_FLAGS}") - endif () -endif () +#if (WITH_OPENMP) +# find_package (OpenMP) +# if (OPENMP_FOUND) +# set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") +# set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}") +# set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${OpenMP_SHARED_LINKER_FLAGS}") +# endif () +#endif () if (WITH_SIMD) find_package (SIMD)