actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Allow customizing the number of jobs for ffmpeg.
This commit is contained in:
Jason Felds
2015-10-25 07:26:20 -04:00
parent da2db95365 131e3264b7
commit ca524d51fa
3 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+5 -5
View File
@@ -9,7 +9,7 @@ notifications:
matrix: matrix:
include: 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 compiler: clang
addons: &clang36 addons: &clang36
apt: apt:
@@ -33,12 +33,12 @@ matrix:
- libglew-dev - 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 compiler: clang
addons: *clang36 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 compiler: gcc
addons: &gcc5 addons: &gcc5
apt: apt:
@@ -68,7 +68,7 @@ install:
- mkdir ${DEPS_DIR} - mkdir ${DEPS_DIR}
- cd ${DEPS_DIR} - cd ${DEPS_DIR}
# Use the binary for cmake instead of building it now. # 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 - mkdir cmake
- wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake - wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
- export PATH=${PWD}/cmake/bin:${PATH} - export PATH=${PWD}/cmake/bin:${PATH}
@@ -76,7 +76,7 @@ install:
before_script: before_script:
- cd ${TRAVIS_BUILD_DIR} - cd ${TRAVIS_BUILD_DIR}
- cd Build - 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: script:
- make -j2 - make -j2
CMake/DefineOptions.cmake
+3
View File
@@ -39,7 +39,10 @@ option(WITH_MP3 "Build with MP3 Support." ON)
option(WITH_OGG "Build with OGG/Vorbis Support." ON) option(WITH_OGG "Build with OGG/Vorbis Support." ON)
if(NOT MSVC) if(NOT MSVC)
# Turn this option off to disable using FFMEPG.
option(WITH_FFMPEG "Build with FFMPEG." ON) 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() endif()
if(WIN32) if(WIN32)
CMake/SetupFfmpeg.cmake
+9 -2
View File
@@ -46,11 +46,18 @@ if (NOT WITH_EXTERNAL_WARNINGS)
) )
endif() 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}") if (IS_DIRECTORY "${SM_FFMPEG_SRC_DIR}")
externalproject_add("ffmpeg" externalproject_add("ffmpeg"
SOURCE_DIR "${SM_FFMPEG_SRC_DIR}" SOURCE_DIR "${SM_FFMPEG_SRC_DIR}"
CONFIGURE_COMMAND ${FFMPEG_CONFIGURE} CONFIGURE_COMMAND ${FFMPEG_CONFIGURE}
BUILD_COMMAND "make" BUILD_COMMAND "${SM_FFMPEG_MAKE}"
UPDATE_COMMAND "" UPDATE_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
@@ -60,7 +67,7 @@ else()
externalproject_add("ffmpeg" externalproject_add("ffmpeg"
DOWNLOAD_COMMAND git clone "--branch" "n${SM_FFMPEG_VERSION}" "--depth" "1" "git://source.ffmpeg.org/ffmpeg.git" "${SM_FFMPEG_SRC_DIR}" 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}" CONFIGURE_COMMAND "${FFMPEG_CONFIGURE}"
BUILD_COMMAND "make" BUILD_COMMAND "${SM_FFMPEG_MAKE}"
UPDATE_COMMAND "" UPDATE_COMMAND ""
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""