Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
wenqing
ogs
Commits
8cb959d5
Commit
8cb959d5
authored
Jun 2, 2017
by
Lars Bilke
Browse files
Options
Downloads
Patches
Plain Diff
[CMake] Find Git before everything else.
parent
3cc40c3b
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+2
-1
2 additions, 1 deletion
CMakeLists.txt
scripts/cmake/Find.cmake
+0
-12
0 additions, 12 deletions
scripts/cmake/Find.cmake
scripts/cmake/PreFind.cmake
+13
-0
13 additions, 0 deletions
scripts/cmake/PreFind.cmake
with
15 additions
and
13 deletions
CMakeLists.txt
+
2
−
1
View file @
8cb959d5
...
...
@@ -29,14 +29,15 @@ option(OGS_BUILD_TESTS "Should the test executables be built?" ON)
option
(
OGS_USE_PCH
"Should pre-compiled headers be used?"
ON
)
### CMake includes ###
include
(
scripts/cmake/PreFind.cmake
)
include
(
scripts/cmake/ConanSetup.cmake
)
include
(
scripts/cmake/CheckTypeSizes.cmake
)
include
(
scripts/cmake/Functions.cmake
)
include
(
scripts/cmake/SubmoduleSetup.cmake
)
include
(
scripts/cmake/CMakeSetup.cmake
)
include
(
scripts/cmake/CompilerSetup.cmake
)
include
(
scripts/cmake/Find.cmake
)
include
(
scripts/cmake/CCacheSetup.cmake
)
include
(
scripts/cmake/SubmoduleSetup.cmake
)
include
(
scripts/cmake/ProjectSetup.cmake
)
include
(
scripts/cmake/DocumentationSetup.cmake
)
include
(
scripts/cmake/test/Test.cmake
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/Find.cmake
+
0
−
12
View file @
8cb959d5
...
...
@@ -21,18 +21,6 @@ find_package(cppcheck QUIET)
find_package
(
PythonInterp QUIET
)
# Check for cmder git installed via chocolatey
find_program
(
GIT_EXECUTABLE
NAMES git
PATHS C:/tools/cmder/vendor/git-for-windows
PATH_SUFFIXES cmd bin
DOC
"Git command line client"
)
find_package
(
Git REQUIRED
)
string
(
REPLACE
"mingw64/"
""
GIT_EXECUTABLE
${
GIT_EXECUTABLE
}
)
# Windows git submodule fix
set
(
GIT_TOOL_PATH
${
GIT_EXECUTABLE
}
CACHE FILEPATH
"The git command line interface"
FORCE
)
# Find bash itself ...
find_program
(
BASH_TOOL_PATH bash
HINTS
${
GITHUB_BIN_DIR
}
DOC
"The bash executable"
)
...
...
This diff is collapsed.
Click to expand it.
scripts/cmake/PreFind.cmake
0 → 100644
+
13
−
0
View file @
8cb959d5
### Find Git
# Check for cmder git installed via chocolatey
find_program
(
GIT_EXECUTABLE
NAMES git
PATHS C:/tools/cmder/vendor/git-for-windows
PATH_SUFFIXES cmd bin
DOC
"Git command line client"
)
find_package
(
Git REQUIRED
)
string
(
REPLACE
"mingw64/"
""
GIT_EXECUTABLE
${
GIT_EXECUTABLE
}
)
# Windows git submodule fix
set
(
GIT_TOOL_PATH
${
GIT_EXECUTABLE
}
CACHE FILEPATH
"The git command line interface"
FORCE
)
### End Find Git
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