diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-14 13:38:34 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-04-14 13:38:34 +0400 |
| commit | d0c1b44debc4d4d1de274a4ecf777f76831cd264 (patch) | |
| tree | 4bcfbf9cb7110cd5e38ba7a918cfe20862581c16 /CMakeLists.txt | |
| parent | e6ff0ec73da5fa82873ea75f4915b7cf8410c454 (diff) | |
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.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 10 |
1 files changed, 1 insertions, 9 deletions
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) |