diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-05-19 20:47:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-05-19 20:47:41 +0400 |
| commit | bf9ddfe86a93b68c93f1d739ff9b364074f4510f (patch) | |
| tree | 1625b95d285799de3aedab92000fb24824f4714a /CMakeLists.txt | |
| parent | eacb629c729de189672c20e3f17ef787b30bdfbb (diff) | |
remove WITH_AVX_CPU, also used add_definitions incorrectly.
single cflags can be added manually and don't need their own options.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index daae377e58f..a4355a7c56a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -157,12 +157,6 @@ mark_as_advanced(WITH_AUDASPACE) option(WITH_BOOL_COMPAT "Continue defining \"TRUE\" and \"FALSE\" until these can be replaced with \"true\" and \"false\" from stdbool.h" ON) mark_as_advanced(WITH_BOOL_COMPAT) -if(MSVC11) - option(WITH_AVX_CPU "Warning: experimental build for newer CPUs with AVX extensions. Doesn't work on older CPUs!" OFF) - mark_as_advanced(WITH_AVX_CPU) -endif() - - # (unix defaults to OpenMP On) if((UNIX AND NOT APPLE) OR (MINGW)) set(PLATFORM_DEFAULT ON) @@ -363,7 +357,7 @@ if(APPLE) # force CMAKE_OSX_DEPLOYMENT_TARGET for makefiles, will not work else ( cmake bug ? ) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=${CMAKE_OSX_DEPLOYMENT_TARGET}") - add_definitions ("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") + add_definitions("-DMACOSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET}") endif() option(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON) @@ -1047,10 +1041,6 @@ elseif(WIN32) # MSVC11 needs _ALLOW_KEYWORD_MACROS to build if(MSVC11) add_definitions(/D_ALLOW_KEYWORD_MACROS) - # Experimental feature compile with /arch:AVX MSVC11 ONLY - if(WITH_AVX_CPU) - add_definitions(/arch:AVX) - endif() endif() set(CMAKE_CXX_FLAGS "/nologo /J /Gd /EHsc" CACHE STRING "MSVC MT C++ flags " FORCE) |