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:
authorArto Kitula <arto.kitula@gmail.com>2017-08-15 12:26:33 +0300
committerArto Kitula <arto.kitula@gmail.com>2017-08-15 12:26:33 +0300
commitcaefe4943b4d2c8424e00df4a9d22487fca4bcd7 (patch)
treeea7cb49bee10b8f1c509dfe8fcfbd90db9332041 /build_files/build_environment/cmake/options.cmake
parent66c1b23aa10ded34869c2efabbe815ea254d4b09 (diff)
[deps_build/macOS] Fix FFMPEG & VPX configure command
FFMPEG & VPX don't handle target with --build parameter, so we need to make sure use of plain configure command Reviewed by: Brecht Van Lommel Differential Revision: http://developer.blender.org/D2791
Diffstat (limited to 'build_files/build_environment/cmake/options.cmake')
-rw-r--r--build_files/build_environment/cmake/options.cmake2
1 files changed, 2 insertions, 0 deletions
diff --git a/build_files/build_environment/cmake/options.cmake b/build_files/build_environment/cmake/options.cmake
index 5618fc1255d..465ca3c034c 100644
--- a/build_files/build_environment/cmake/options.cmake
+++ b/build_files/build_environment/cmake/options.cmake
@@ -108,6 +108,7 @@ if(WIN32)
)
set(CONFIGURE_COMMAND sh ./configure)
+ set(CONFIGURE_COMMAND_NO_TARGET ${CONFIGURE_COMMAND})
else()
set(PATCH_CMD patch)
set(LIBEXT ".a")
@@ -163,6 +164,7 @@ else()
)
set(CONFIGURE_ENV_NO_PERL ${CONFIGURE_ENV})
set(CONFIGURE_COMMAND ./configure ${PLATFORM_BUILD_TARGET})
+ set(CONFIGURE_COMMAND_NO_TARGET ./configure)
endif()
set(DEFAULT_CMAKE_FLAGS