Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
T
ThirdParty-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Development
ThirdParty-common
Commits
8400503c
Commit
8400503c
authored
8 years ago
by
mark
Browse files
Options
Downloads
Patches
Plain Diff
STYLE: report path of cmake,qmake being used
- makes it easier to diagnose problems
parent
a7a5eab9
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
etc/tools/ThirdPartyFunctions
+10
-4
10 additions, 4 deletions
etc/tools/ThirdPartyFunctions
with
10 additions
and
4 deletions
etc/tools/ThirdPartyFunctions
+
10
−
4
View file @
8400503c
...
...
@@ -137,6 +137,7 @@ findCMake()
foundExe
=
"
$(
cd
${
foundExe
%/cmake
}
2>/dev/null
&&
pwd
)
/cmake"
fi
echo
"Using cmake=
$foundExe
"
1>&2
echo
"
$foundExe
"
return
0
else
...
...
@@ -148,8 +149,10 @@ NOT_FOUND
fi
fi
# Default is cmake from the path
echo
cmake
# Default to use the path, try resolving (so we know what we are using)
foundExe
=
$(
command
-v
cmake 2> /dev/null
)
||
foundExe
=
qmake
echo
"Using cmake=
${
foundExe
:-
NotFound
}
"
1>&2
echo
"
${
foundExe
:-
cmake
}
"
}
...
...
@@ -205,6 +208,7 @@ findQtMake()
foundExe
=
"
$(
cd
${
foundExe
%/qmake
}
2>/dev/null
&&
pwd
)
/qmake"
fi
echo
"Using qmake=
$foundExe
"
1>&2
echo
"
$foundExe
"
return
0
else
...
...
@@ -216,8 +220,10 @@ NOT_FOUND
fi
fi
# Default is qmake from the path
echo
qmake
# Default to use the path, try resolving (so we know what we are using)
foundExe
=
$(
command
-v
qmake 2> /dev/null
)
||
foundExe
=
qmake
echo
"Using qmake=
${
foundExe
:-
NotFound
}
"
1>&2
echo
"
${
foundExe
:-
qmake
}
"
}
...
...
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