From d0c1b44debc4d4d1de274a4ecf777f76831cd264 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 14 Apr 2014 15:38:34 +0600 Subject: CMake: enable OpenMP for all platforms by default This is done in SCons and the only reason to disable OpenMP on Windows was to deal with the express version of compilers. Now when we are about to switch to msvc2013 by default we can safely enable OpenMP there since even express version of this beast supports OpenMP. --- CMakeLists.txt | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'CMakeLists.txt') diff --git a/CMakeLists.txt b/CMakeLists.txt index ccdc2426c22..b73a0e13371 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -155,15 +155,7 @@ mark_as_advanced(WITH_HEADLESS) option(WITH_AUDASPACE "Build with blenders audio library (only disable if you know what you're doing!)" ON) mark_as_advanced(WITH_AUDASPACE) -# (unix defaults to OpenMP On) -if((UNIX AND NOT APPLE) OR (MINGW)) - set(PLATFORM_DEFAULT ON) -else() - set(PLATFORM_DEFAULT OFF) -endif() -option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ${PLATFORM_DEFAULT}) -unset(PLATFORM_DEFAULT) - +option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON) if(UNIX AND NOT APPLE) option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) -- cgit v1.2.3