diff options
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 37 |
1 files changed, 18 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 87265e959e5..cb131c6e5e1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -316,12 +316,6 @@ IF(UNIX AND NOT APPLE) SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing -Wno-char-subscripts") - IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}") - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) - ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_LINKFLAGS "-pthread") # Better warnings @@ -633,12 +627,6 @@ IF(WIN32) SET(WITH_JACK OFF) ENDIF(WITH_JACK) - IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}") - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) - ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - ENDIF(MSVC) ENDIF(WIN32) @@ -819,12 +807,6 @@ IF(APPLE) SET(TIFF_LIBPATH ${TIFF}/lib) ENDIF(WITH_IMAGE_TIFF) - IF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(PLATFORM_CFLAGS " -msse -msse2 ${PLATFORM_CFLAGS}") - ADD_DEFINITIONS(-D__SSE__) - ADD_DEFINITIONS(-D__MMX__) - ENDIF(WITH_RAYOPTIMIZATION AND SUPPORT_SSE_BUILD) - SET(EXETYPE MACOSX_BUNDLE) SET(CMAKE_C_FLAGS_DEBUG "-fno-strict-aliasing -g") @@ -868,9 +850,26 @@ IF(WITH_BUILDINFO) ENDIF(BUILD_REV_RETURN) ENDIF(WIN32) ENDIF(WITH_BUILDINFO) - #----------------------------------------------------------------------------- # Common. + +IF(WITH_RAYOPTIMIZATION) + IF(CMAKE_COMPILER_IS_GNUCC) + IF(SUPPORT_SSE_BUILD) + SET(PLATFORM_CFLAGS " -msse ${PLATFORM_CFLAGS}") + ADD_DEFINITIONS(-D__SSE__) + ADD_DEFINITIONS(-D__MMX__) + ENDIF(SUPPORT_SSE_BUILD) + IF(SUPPORT_SSE2_BUILD) + SET(PLATFORM_CFLAGS " -msse2 ${PLATFORM_CFLAGS}") + ADD_DEFINITIONS(-D__SSE2__) + IF(NOT SUPPORT_SSE_BUILD) # dont double up + ADD_DEFINITIONS(-D__MMX__) + ENDIF(NOT SUPPORT_SSE_BUILD) + ENDIF(SUPPORT_SSE2_BUILD) + ENDIF(CMAKE_COMPILER_IS_GNUCC) +ENDIF(WITH_RAYOPTIMIZATION) + IF(WITH_IMAGE_OPENJPEG) set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg) set(OPENJPEG_INC ${OPENJPEG}) |