Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
cmake-modules
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Requirements
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Data Management Clients
cmake-modules
Commits
0f21335f
Commit
0f21335f
authored
7 years ago
by
Alejandro Alvarez Ayllon
Browse files
Options
Downloads
Patches
Plain Diff
DMC-996
: Again another incompatible flag for gsoap
-v hangs, but -help doesn't give the version, use -V
parent
4d3615ca
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
modules/FindgSOAP.cmake
+9
-1
9 additions, 1 deletion
modules/FindgSOAP.cmake
with
9 additions
and
1 deletion
modules/FindgSOAP.cmake
+
9
−
1
View file @
0f21335f
...
...
@@ -94,10 +94,18 @@ message(STATUS " - wsdlh : ${GSOAP_WSDL2H}")
message
(
STATUS
" - SOAPCPP2 :
${
GSOAP_SOAPCPP2
}
"
)
# some versions of soapcpp2 interpret "-v" as verbose, and hang while waiting for input
# try "-help" first
, and if it fails, do "-v"
# try "-help" first
execute_process
(
COMMAND
${
GSOAP_SOAPCPP2
}
"-help"
OUTPUT_VARIABLE GSOAP_STRING_VERSION ERROR_VARIABLE GSOAP_STRING_VERSION
)
string
(
REGEX MATCH
"[0-9]*
\\
.[0-9]*
\\
.[0-9]*"
GSOAP_VERSION
${
GSOAP_STRING_VERSION
}
)
# for some reason, -help stopped giving the version at some point
# but -v also hangs, so try -V (gah)
if
(
"
${
GSOAP_VERSION
}
"
STREQUAL
".."
)
execute_process
(
COMMAND
${
GSOAP_SOAPCPP2
}
"-V"
OUTPUT_VARIABLE GSOAP_STRING_VERSION ERROR_VARIABLE GSOAP_STRING_VERSION
)
string
(
REGEX MATCH
"[0-9]*
\\
.[0-9]*
\\
.[0-9]*"
GSOAP_VERSION
${
GSOAP_STRING_VERSION
}
)
endif
()
# nothing worked, fallback to -v
if
(
"
${
GSOAP_VERSION
}
"
STREQUAL
".."
)
execute_process
(
COMMAND
${
GSOAP_SOAPCPP2
}
"-v"
OUTPUT_VARIABLE GSOAP_STRING_VERSION ERROR_VARIABLE GSOAP_STRING_VERSION
)
string
(
REGEX MATCH
"[0-9]*
\\
.[0-9]*
\\
.[0-9]*"
GSOAP_VERSION
${
GSOAP_STRING_VERSION
}
)
...
...
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