-
-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
1279610
commit fe43e5c
Showing
3 changed files
with
92 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,10 @@ | ||
| cmake_minimum_required(VERSION 3.2) | ||
|
|
||
| project(build-deps | ||
| DESCRIPTION "Pre-build dependencies for LizardByte projects" | ||
| ) | ||
| DESCRIPTION "Pre-build dependencies for LizardByte projects") | ||
|
|
||
| option(FFMPEG_CBS "Enable CBS library configuration" ON) | ||
|
|
||
| if (FFMPEG_CBS) | ||
| include (${CMAKE_CURRENT_SOURCE_DIR}/cmake/ffmpeg_cbs.cmake) | ||
| if(FFMPEG_CBS) | ||
| include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ffmpeg_cbs.cmake) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,23 @@ | ||
| # | ||
| # This macro applies patch to git repository if patch is applicable | ||
| # Arguments are path to git repository and path to the git patch | ||
| # | ||
| macro(apply_git_patch REPO_PATH PATCH_PATH) | ||
| execute_process(COMMAND git apply -v --ignore-whitespace --check ${PATCH_PATH} | ||
| WORKING_DIRECTORY ${REPO_PATH} | ||
| RESULT_VARIABLE SUCCESS | ||
| COMMAND_ECHO STDOUT) | ||
|
|
||
| if(${SUCCESS} EQUAL 0) | ||
| message("Applying git patch ${PATCH_PATH} in ${REPO_PATH} repository") | ||
| execute_process(COMMAND git apply -v --ignore-whitespace ${PATCH_PATH} | ||
| WORKING_DIRECTORY ${REPO_PATH} | ||
| # APPLY_GIT_PATCH: args = `repo_path`, `patch_path` | ||
| macro(APPLY_GIT_PATCH repo_path patch_path) | ||
| execute_process(COMMAND git apply -v --ignore-whitespace --check ${patch_path} | ||
| WORKING_DIRECTORY ${repo_path} | ||
| RESULT_VARIABLE SUCCESS | ||
| COMMAND_ECHO STDOUT) | ||
|
|
||
| if(${SUCCESS} EQUAL 0) | ||
| message("Applying git patch ${patch_path} in ${repo_path} repository") | ||
| execute_process(COMMAND git apply -v --ignore-whitespace ${patch_path} | ||
| WORKING_DIRECTORY ${repo_path} | ||
| RESULT_VARIABLE SUCCESS | ||
| COMMAND_ECHO STDOUT) | ||
|
|
||
| if(${SUCCESS} EQUAL 1) | ||
| # We don't stop here because it can happen in case of parallel builds | ||
| message(WARNING "\nError: failed to apply the patch patch: ${PATCH_PATH}\n") | ||
| message(WARNING "\nError: failed to apply the patch patch: ${patch_path}\n") | ||
| endif() | ||
| endif() | ||
| endmacro() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters