Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Development
ThirdParty-common
Commits
8400503c
Commit
8400503c
authored
Nov 23, 2016
by
mark
Browse files
STYLE: report path of cmake,qmake being used
- makes it easier to diagnose problems
parent
a7a5eab9
Changes
1
Hide whitespace changes
Inline
Side-by-side
etc/tools/ThirdPartyFunctions
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
}
"
}
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment