diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-10-01 22:29:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-01 22:29:40 +0400 |
| commit | 622e8ee363333dee5a80564ca1d13cbbbb6de3cb (patch) | |
| tree | a75a8e319396c3c6c74ffc19cf0669ae5876f280 /CMakeLists.txt | |
| parent | 9a88524f681d62cee51dfbc3186d59b4b0712a05 (diff) | |
cmake: sse flags were being defined in 2 different places
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c95509b0a08..1b65c888cfc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -273,7 +273,7 @@ if(WITH_PYTHON_MODULE) set(WITH_HEADLESS ON) endif() -TEST_SSE_SUPPORT() +TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG) # don't store paths to libs for portable distrobution if(WITH_INSTALL_PORTABLE) @@ -1128,34 +1128,17 @@ endif() # See TEST_SSE_SUPPORT() for how this is defined. if(WITH_RAYOPTIMIZATION) - if(CMAKE_COMPILER_IS_GNUCC) - set(_sse "-msse") - set(_sse2 "-msse2") - elseif(MSVC) - set(_sse "/arch:SSE") - set(_sse2 "/arch:SSE2") - elseif(CMAKE_C_COMPILER_ID MATCHES "Intel") - set(_sse) # icc only has sse2 - set(_sse2 "-xSSE2") - else() - message(WARNING "SSE flags for this compiler: '${CMAKE_C_COMPILER_ID}' not known") - set(_sse) - set(_sse2) - endif() - if(SUPPORT_SSE_BUILD) - set(PLATFORM_CFLAGS " ${_sse} ${PLATFORM_CFLAGS}") + set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") add_definitions(-D__SSE__ -D__MMX__) endif() if(SUPPORT_SSE2_BUILD) - set(PLATFORM_CFLAGS " ${_sse2} ${PLATFORM_CFLAGS}") + set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") add_definitions(-D__SSE2__) if(NOT SUPPORT_SSE_BUILD) # dont double up add_definitions(-D__MMX__) endif() endif() - unset(_sse) - unset(_sse2) endif() |