Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
S
Suyu
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
many-archive
Suyu
Commits
cae9708a
There was an error fetching the commit references. Please try again later.
Commit
cae9708a
authored
5 years ago
by
Tobias
Committed by
GitHub
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Revert "CMake: Get Git submodule dependencies via CMake (#2474)"
This reverts commit
5cef446f
.
parent
bb4a1e05
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.travis/linux-mingw/build.sh
+2
-3
2 additions, 3 deletions
.travis/linux-mingw/build.sh
CMakeLists.txt
+16
-12
16 additions, 12 deletions
CMakeLists.txt
with
18 additions
and
15 deletions
.travis/linux-mingw/build.sh
+
2
−
3
View file @
cae9708a
#!/bin/bash -ex
#!/bin/bash -ex
mkdir
"
$HOME
/.ccache"
||
true
mkdir
-p
"
$HOME
/.ccache"
docker run
--env-file
.travis/common/travis-ci.env
-v
$(
pwd
)
:/yuzu
-v
"
$HOME
/.ccache"
:/root/.ccache yuzuemu/build-environments:linux-mingw /bin/bash
-ex
/yuzu/.travis/linux-mingw/docker.sh
docker run
-e
ENABLE_COMPATIBILITY_REPORTING
--env-file
.travis/common/travis-ci.env
-v
$(
pwd
)
:/yuzu
-v
"
$HOME
/.ccache"
:/root/.ccache yuzuemu/build-environments:linux-mingw /bin/bash /yuzu/.travis/linux-mingw/docker.sh
This diff is collapsed.
Click to expand it.
CMakeLists.txt
+
16
−
12
View file @
cae9708a
...
@@ -7,18 +7,6 @@ include(CMakeDependentOption)
...
@@ -7,18 +7,6 @@ include(CMakeDependentOption)
project
(
yuzu
)
project
(
yuzu
)
# Get Git submodule dependencies
find_package
(
Git QUIET
)
if
(
GIT_FOUND AND EXISTS
"
${
PROJECT_SOURCE_DIR
}
/.git"
)
execute_process
(
COMMAND
${
GIT_EXECUTABLE
}
submodule update --init --recursive
WORKING_DIRECTORY
${
CMAKE_CURRENT_SOURCE_DIR
}
RESULT_VARIABLE GIT_SUBMOD_RESULT
)
if
(
NOT GIT_SUBMOD_RESULT EQUAL
"0"
)
message
(
FATAL_ERROR
"git submodule update --init --recursive failed with
${
GIT_SUBMOD_RESULT
}
, "
"please checkout submodules manually with
\"
git submodule update --init --recursive
\"
"
)
endif
()
endif
()
# Set bundled sdl2/qt as dependent options.
# Set bundled sdl2/qt as dependent options.
# OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
# OFF by default, but if ENABLE_SDL2 and MSVC are true then ON
option
(
ENABLE_SDL2
"Enable the SDL2 frontend"
ON
)
option
(
ENABLE_SDL2
"Enable the SDL2 frontend"
ON
)
...
@@ -45,6 +33,22 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit)
...
@@ -45,6 +33,22 @@ if(NOT EXISTS ${PROJECT_SOURCE_DIR}/.git/hooks/pre-commit)
DESTINATION
${
PROJECT_SOURCE_DIR
}
/.git/hooks
)
DESTINATION
${
PROJECT_SOURCE_DIR
}
/.git/hooks
)
endif
()
endif
()
# Sanity check : Check that all submodules are present
# =======================================================================
function
(
check_submodules_present
)
file
(
READ
"
${
PROJECT_SOURCE_DIR
}
/.gitmodules"
gitmodules
)
string
(
REGEX MATCHALL
"path *= *[^
\t\r\n
]*"
gitmodules
${
gitmodules
}
)
foreach
(
module
${
gitmodules
}
)
string
(
REGEX REPLACE
"path *= *"
""
module
${
module
}
)
if
(
NOT EXISTS
"
${
PROJECT_SOURCE_DIR
}
/
${
module
}
/.git"
)
message
(
FATAL_ERROR
"Git submodule
${
module
}
not found. "
"Please run: git submodule update --init --recursive"
)
endif
()
endforeach
()
endfunction
()
check_submodules_present
()
configure_file
(
${
PROJECT_SOURCE_DIR
}
/dist/compatibility_list/compatibility_list.qrc
configure_file
(
${
PROJECT_SOURCE_DIR
}
/dist/compatibility_list/compatibility_list.qrc
${
PROJECT_BINARY_DIR
}
/dist/compatibility_list/compatibility_list.qrc
${
PROJECT_BINARY_DIR
}
/dist/compatibility_list/compatibility_list.qrc
COPYONLY
)
COPYONLY
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment