diff options
| author | Christian Fetzer <fetzer.ch@gmail.com> | 2016-07-19 15:46:19 +0200 |
|---|---|---|
| committer | Christian Fetzer <fetzer.ch@gmail.com> | 2016-07-21 12:23:07 +0200 |
| commit | f3c66856dd71c9145e3c1955fe106af974bd7bf4 (patch) | |
| tree | 9e1f9612d95fe6ea5106647dbe77956c167d3567 /tools | |
| parent | 179f823095dba8ffea51566abd3228bdff6bea5b (diff) | |
[cmake] Let ExternalProject_Add figure out the right 'make' command
ExternalProject.cmake sets a default BUILD_COMMAND to 'make'. Not
overriding it has the advantage that it figures out the best option
itself (including passing down parallel build parameters).
This fixes the Ninja build on Linux due to a problem introduced in
810895469a621c2eb25dbb2ef4aba75ecf067c8b where ninja would be used to
build ffmpeg and cpluff (which doesn't work).
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/depends/target/ffmpeg/CMakeLists.txt | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/depends/target/ffmpeg/CMakeLists.txt b/tools/depends/target/ffmpeg/CMakeLists.txt index 9e83bf2f96..94813860dd 100644 --- a/tools/depends/target/ffmpeg/CMakeLists.txt +++ b/tools/depends/target/ffmpeg/CMakeLists.txt @@ -48,12 +48,6 @@ if(GNUTLS_FOUND) list(APPEND ffmpeg_conf --enable-gnutls) endif() -include(ProcessorCount) -ProcessorCount(N) -if(NOT N EQUAL 0) - set(PARALLEL_FLAGS -j${N}) -endif() - include(ExternalProject) externalproject_add(ffmpeg SOURCE_DIR ${CMAKE_SOURCE_DIR} @@ -81,8 +75,7 @@ externalproject_add(ffmpeg --enable-protocol=http --enable-encoder=png --enable-encoder=mjpeg - ${ffmpeg_conf} - BUILD_COMMAND ${CMAKE_MAKE_PROGRAM} ${PARALLEL_FLAGS}) + ${ffmpeg_conf}) install(CODE "Message(Done)") |