diff options
author | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
---|---|---|
committer | Joseph Eagar <joeedh@gmail.com> | 2010-09-04 09:31:25 +0400 |
commit | bb7339a7aec37bdb2ee8a21599e6c65b37ef1277 (patch) | |
tree | 6fb8da94c6e43098c606f768e722484b04b8645c /build_files/cmake/macros.cmake | |
parent | 37f2c8a64c3277f100ab084ef1bb3846bc7b2c62 (diff) | |
parent | 8a320974f1b3e6004db3b3ad64f97742f878cbee (diff) |
merge with trunk at r31523
Diffstat (limited to 'build_files/cmake/macros.cmake')
-rw-r--r-- | build_files/cmake/macros.cmake | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 84e6b788dc0..0957ace301c 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -58,12 +58,12 @@ MACRO(SETUP_LIBDIRS) IF(WITH_FFMPEG) LINK_DIRECTORIES(${FFMPEG_LIBPATH}) ENDIF(WITH_FFMPEG) - IF(WITH_OPENEXR) + IF(WITH_IMAGE_OPENEXR) LINK_DIRECTORIES(${OPENEXR_LIBPATH}) - ENDIF(WITH_OPENEXR) - IF(WITH_TIFF) + ENDIF(WITH_IMAGE_OPENEXR) + IF(WITH_IMAGE_TIFF) LINK_DIRECTORIES(${TIFF_LIBPATH}) - ENDIF(WITH_TIFF) + ENDIF(WITH_IMAGE_TIFF) IF(WITH_LCMS) LINK_DIRECTORIES(${LCMS_LIBPATH}) ENDIF(WITH_LCMS) @@ -140,10 +140,10 @@ MACRO(SETUP_LIBLINKS IF(WITH_QUICKTIME) TARGET_LINK_LIBRARIES(${target} ${QUICKTIME_LIB}) ENDIF(WITH_QUICKTIME) - IF(WITH_TIFF) + IF(WITH_IMAGE_TIFF) TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY}) - ENDIF(WITH_TIFF) - IF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_TIFF) + IF(WITH_IMAGE_OPENEXR) IF(WIN32) FOREACH(loop_var ${OPENEXR_LIB}) TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) @@ -152,7 +152,7 @@ MACRO(SETUP_LIBLINKS ELSE(WIN32) TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) ENDIF(WIN32) - ENDIF(WITH_OPENEXR) + ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_LCMS) TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY}) ENDIF(WITH_LCMS) @@ -183,21 +183,41 @@ MACRO(SETUP_LIBLINKS ENDMACRO(SETUP_LIBLINKS) MACRO(TEST_SSE_SUPPORT) - INCLUDE(CheckCXXSourceCompiles) + INCLUDE(CheckCSourceRuns) MESSAGE(STATUS "Detecting SSE support") IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX) SET(CMAKE_REQUIRED_FLAGS "-msse -msse2") ELSEIF(MSVC) - SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2") + SET(CMAKE_REQUIRED_FLAGS "/arch:SSE2") # TODO, SSE 1 ? ENDIF() - CHECK_CXX_SOURCE_COMPILES(" + CHECK_C_SOURCE_RUNS(" #include <xmmintrin.h> int main() { __m128 v = _mm_setzero_ps(); return 0; }" SUPPORT_SSE_BUILD) + + CHECK_C_SOURCE_RUNS(" + #include <emmintrin.h> + int main() { __m128d v = _mm_setzero_pd(); return 0; }" + SUPPORT_SSE2_BUILD) + MESSAGE(STATUS "Detecting SSE support") + + IF(SUPPORT_SSE_BUILD) + MESSAGE(STATUS " ...SSE support found.") + ELSE(SUPPORT_SSE_BUILD) + MESSAGE(STATUS " ...SSE support missing.") + ENDIF(SUPPORT_SSE_BUILD) + + IF(SUPPORT_SSE2_BUILD) + MESSAGE(STATUS " ...SSE2 support found.") + ELSE(SUPPORT_SSE2_BUILD) + MESSAGE(STATUS " ...SSE2 support missing.") + ENDIF(SUPPORT_SSE2_BUILD) + ENDMACRO(TEST_SSE_SUPPORT) + MACRO(GET_BLENDER_VERSION) FILE(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h CONTENT) STRING(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}") |