diff options
Diffstat (limited to 'build_files/cmake/macros.cmake')
-rw-r--r-- | build_files/cmake/macros.cmake | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 84e6b788dc0..22c090342ef 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) @@ -198,6 +198,7 @@ MACRO(TEST_SSE_SUPPORT) SUPPORT_SSE_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}") |