Merge pull request #897 from wolfman2000/wolf-ffmpeg-jobs

Allow customizing the number of jobs for ffmpeg.

.travis.yml

@@ -9,7 +9,7 @@ notifications:
 matrix:
     include:
         -
-            env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF
+            env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1
             compiler: clang
             addons: &clang36
                 apt:
@@ -33,12 +33,12 @@ matrix:
                         - libglew-dev
 
         -
-            env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=ON
+            env: CXX_COMPILER=clang++-3.6 CC_COMPILER=clang-3.6 BUILD_TYPE=Release WITH_FFMPEG=ON WITH_FFMPEG_JOBS=1
             compiler: clang
             addons: *clang36
 
         -
-            env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF
+            env: CXX_COMPILER=g++-5 CC_COMPILER=gcc-5 BUILD_TYPE=Release WITH_FFMPEG=OFF WITH_FFMPEG_JOBS=1
             compiler: gcc
             addons: &gcc5
                 apt:
@@ -68,7 +68,7 @@ install:
     - mkdir ${DEPS_DIR}
     - cd ${DEPS_DIR}
     # Use the binary for cmake instead of building it now.
-    - export CMAKE_URL=http://www.cmake.org/files/v3.3/cmake-3.3.1-Linux-x86_64.tar.gz
+    - export CMAKE_URL=http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz
     - mkdir cmake
     - wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
     - export PATH=${PWD}/cmake/bin:${PATH}
@@ -76,7 +76,7 @@ install:
 before_script:
     - cd ${TRAVIS_BUILD_DIR}
     - cd Build
-    - cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG}
+    - cmake .. -DCMAKE_CXX_COMPILER=${CXX_COMPILER} -DCMAKE_C_COMPILER=${CC_COMPILER} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DWITH_FFMPEG=${WITH_FFMPEG} -DWITH_FFMPEG_JOBS=${WITH_FFMPEG_JOBS}
 
 script:
     - make -j2

CMake/DefineOptions.cmake

@@ -39,7 +39,10 @@ option(WITH_MP3 "Build with MP3 Support." ON)
 option(WITH_OGG "Build with OGG/Vorbis Support." ON)
 
 if(NOT MSVC)
+  # Turn this option off to disable using FFMEPG.
   option(WITH_FFMPEG "Build with FFMPEG." ON)
+  # Change this number to utilize a different number of jobs for building FFMPEG.
+  option(WITH_FFMPEG_JOBS "Build FFMPEG with this many jobs." 2)
 endif()
 
 if(WIN32)

CMake/SetupFfmpeg.cmake

@@ -46,11 +46,18 @@ if (NOT WITH_EXTERNAL_WARNINGS)
   )
 endif()
 
+list(APPEND SM_FFMPEG_MAKE
+  "make"
+)
+if (WITH_FFMPEG_JOBS GREATER 1)
+  list(APPEND SM_FFMPEG_MAKE "-j${WITH_FFMPEG_JOBS}")
+endif()
+
 if (IS_DIRECTORY "${SM_FFMPEG_SRC_DIR}")
   externalproject_add("ffmpeg"
     SOURCE_DIR "${SM_FFMPEG_SRC_DIR}"
     CONFIGURE_COMMAND ${FFMPEG_CONFIGURE}
-    BUILD_COMMAND "make"
+    BUILD_COMMAND "${SM_FFMPEG_MAKE}"
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""
@@ -60,7 +67,7 @@ else()
   externalproject_add("ffmpeg"
     DOWNLOAD_COMMAND git clone "--branch" "n${SM_FFMPEG_VERSION}" "--depth" "1" "git://source.ffmpeg.org/ffmpeg.git" "${SM_FFMPEG_SRC_DIR}"
     CONFIGURE_COMMAND "${FFMPEG_CONFIGURE}"
-    BUILD_COMMAND "make"
+    BUILD_COMMAND "${SM_FFMPEG_MAKE}"
     UPDATE_COMMAND ""
     INSTALL_COMMAND ""
     TEST_COMMAND ""