Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
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
Service Desk
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
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Erik Palmer
VTK
Commits
dae8b1b6
Commit
dae8b1b6
authored
9 years ago
by
Ben Boeckel
Browse files
Options
Downloads
Patches
Plain Diff
FindJsonCpp: fix typo in regex
parent
e321b129
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
CMake/FindJsonCpp.cmake
+1
-1
1 addition, 1 deletion
CMake/FindJsonCpp.cmake
with
1 addition
and
1 deletion
CMake/FindJsonCpp.cmake
+
1
−
1
View file @
dae8b1b6
...
...
@@ -23,7 +23,7 @@ set(_JsonCpp_version_args)
if
(
EXISTS
"
${
JsonCpp_INCLUDE_DIR
}
/json/version.h"
)
file
(
STRINGS
"
${
JsonCpp_INCLUDE_DIR
}
/json/version.h"
_JsonCpp_version_contents REGEX
"#
\\
s+define
\\
s+JSONCPP_VERSION_[A-Z]+"
)
foreach
(
_JsonCpp_version_part MAJOR MINOR PATCH
)
string
(
REGEX REPLACE
".*#
\\
s*define
ARMA
_VERSION_
${
_JsonCpp_version_part
}
\\
s+([0-9]+).*"
"
\\
1"
JsonCpp_VERSION_
${
_JsonCpp_version_part
}
"
${
_JsonCpp_version_contents
}
"
)
string
(
REGEX REPLACE
".*#
\\
s*define
JSONCPP
_VERSION_
${
_JsonCpp_version_part
}
\\
s+([0-9]+).*"
"
\\
1"
JsonCpp_VERSION_
${
_JsonCpp_version_part
}
"
${
_JsonCpp_version_contents
}
"
)
endforeach
()
set
(
JsonCpp_VERSION_STRING
"
${
JsonCpp_VERSION_MAJOR
}
.
${
JsonCpp_VERSION_MINOR
}
.
${
JsonCpp_VERSION_PATCH
}
"
)
...
...
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