Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:35:54 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:35:54 +0300
commit3076d95ba441cd32706a27d18922a30f8fd28b8a (patch)
tree1c4f33b41c3d6d94a738e598c95423cdcfa8a34d /build_files/build_environment/cmake/x264.cmake
parent91a9cd0a94000047248598394c41ac30f893f147 (diff)
Cleanup: use 2 space indentation for CMake
Diffstat (limited to 'build_files/build_environment/cmake/x264.cmake')
-rw-r--r--build_files/build_environment/cmake/x264.cmake34
1 files changed, 17 insertions, 17 deletions
diff --git a/build_files/build_environment/cmake/x264.cmake b/build_files/build_environment/cmake/x264.cmake
index 7d7b0758aaf..eba0709e196 100644
--- a/build_files/build_environment/cmake/x264.cmake
+++ b/build_files/build_environment/cmake/x264.cmake
@@ -17,29 +17,29 @@
# ***** END GPL LICENSE BLOCK *****
if(WIN32)
- set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
- set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
+ set(X264_EXTRA_ARGS --enable-win32thread --cross-prefix=${MINGW_HOST}- --host=${MINGW_HOST})
+ set(X264_PATCH_CMD ${PATCH_CMD} --verbose -p 1 -N -d ${BUILD_DIR}/x264/src/external_x264 < ${PATCH_DIR}/x264.diff)
else()
- set(X264_PATCH_CMD echo .)
+ set(X264_PATCH_CMD echo .)
endif()
ExternalProject_Add(external_x264
- URL ${X264_URI}
- DOWNLOAD_DIR ${DOWNLOAD_DIR}
- URL_HASH SHA256=${X264_HASH}
- PREFIX ${BUILD_DIR}/x264
- PATCH_COMMAND ${X264_PATCH_CMD}
- CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
- --enable-static
- --enable-pic
- --disable-lavf
- ${X264_EXTRA_ARGS}
- BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
- INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
- INSTALL_DIR ${LIBDIR}/x264
+ URL ${X264_URI}
+ DOWNLOAD_DIR ${DOWNLOAD_DIR}
+ URL_HASH SHA256=${X264_HASH}
+ PREFIX ${BUILD_DIR}/x264
+ PATCH_COMMAND ${X264_PATCH_CMD}
+ CONFIGURE_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && ${CONFIGURE_COMMAND} --prefix=${LIBDIR}/x264
+ --enable-static
+ --enable-pic
+ --disable-lavf
+ ${X264_EXTRA_ARGS}
+ BUILD_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make -j${MAKE_THREADS}
+ INSTALL_COMMAND ${CONFIGURE_ENV} && cd ${BUILD_DIR}/x264/src/external_x264/ && make install
+ INSTALL_DIR ${LIBDIR}/x264
)
if(MSVC)
- set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
+ set_target_properties(external_x264 PROPERTIES FOLDER Mingw)
endif()