Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
partons
core
partons-example
Commits
17f4ebab
Commit
17f4ebab
authored
Jul 21, 2021
by
vbertone
Browse files
Fixing configuration error occuring on Mac only
parent
593eba5a
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
17f4ebab
...
...
@@ -112,24 +112,24 @@ string(STRIP ${ELEMUTILS_REVISION} ELEMUTILS_REVISION)
file
(
READ
${
NumA++_INCLUDE_DIR
}
/NumA/NumAVersion.h VERSION_STR
)
string
(
REGEX MATCH
"NUMA_GIT_BRANCH[
\t
]*[^
\t\n
]*
\n
"
NUMA_BRANCH
${
VERSION_STR
}
)
string
(
REGEX REPLACE
"NUMA_GIT_BRANCH[
\t
]*"
""
NUMA_BRANCH
${
NUMA_BRANCH
}
)
string
(
REGEX REPLACE
"
\"
"
""
NUMA_BRANCH
${
NUMA_BRANCH
}
)
string
(
STRIP
${
NUMA_BRANCH
}
NUMA_BRANCH
)
string
(
REGEX REPLACE
"NUMA_GIT_BRANCH[
\t
]*"
""
NUMA_BRANCH
"
${
NUMA_BRANCH
}
"
)
string
(
REGEX REPLACE
"
\"
"
""
NUMA_BRANCH
"
${
NUMA_BRANCH
}
"
)
string
(
STRIP
"
${
NUMA_BRANCH
}
"
NUMA_BRANCH
)
string
(
REGEX MATCH
"NUMA_GIT_REVISION[
\t
]*[^
\t\n
]*
\n
"
NUMA_REVISION
${
VERSION_STR
}
)
string
(
REGEX REPLACE
"NUMA_GIT_REVISION[
\t
]*"
""
NUMA_REVISION
${
NUMA_REVISION
}
)
string
(
REGEX REPLACE
"
\"
"
""
NUMA_REVISION
${
NUMA_REVISION
}
)
string
(
STRIP
${
NUMA_REVISION
}
NUMA_REVISION
)
string
(
REGEX REPLACE
"NUMA_GIT_REVISION[
\t
]*"
""
NUMA_REVISION
"
${
NUMA_REVISION
}
"
)
string
(
REGEX REPLACE
"
\"
"
""
NUMA_REVISION
"
${
NUMA_REVISION
}
"
)
string
(
STRIP
"
${
NUMA_REVISION
}
"
NUMA_REVISION
)
file
(
READ
${
PARTONS_INCLUDE_DIR
}
/partons/PartonsVersion.h VERSION_STR
)
string
(
REGEX MATCH
"PARTONS_GIT_BRANCH[
\t
]*[^
\t\n
]*
\n
"
PARTONS_BRANCH
${
VERSION_STR
}
)
string
(
REGEX REPLACE
"PARTONS_GIT_BRANCH[
\t
]*"
""
PARTONS_BRANCH
${
PARTONS_BRANCH
}
)
string
(
REGEX REPLACE
"
\"
"
""
PARTONS_BRANCH
${
PARTONS_BRANCH
}
)
string
(
STRIP
${
PARTONS_BRANCH
}
PARTONS_BRANCH
)
string
(
REGEX REPLACE
"PARTONS_GIT_BRANCH[
\t
]*"
""
PARTONS_BRANCH
"
${
PARTONS_BRANCH
}
"
)
string
(
REGEX REPLACE
"
\"
"
""
PARTONS_BRANCH
"
${
PARTONS_BRANCH
}
"
)
string
(
STRIP
"
${
PARTONS_BRANCH
}
"
PARTONS_BRANCH
)
string
(
REGEX MATCH
"PARTONS_GIT_REVISION[
\t
]*[^
\t\n
]*
\n
"
PARTONS_REVISION
${
VERSION_STR
}
)
string
(
REGEX REPLACE
"PARTONS_GIT_REVISION[
\t
]*"
""
PARTONS_REVISION
${
PARTONS_REVISION
}
)
string
(
REGEX REPLACE
"
\"
"
""
PARTONS_REVISION
${
PARTONS_REVISION
}
)
string
(
STRIP
${
PARTONS_REVISION
}
PARTONS_REVISION
)
string
(
REGEX REPLACE
"PARTONS_GIT_REVISION[
\t
]*"
""
PARTONS_REVISION
"
${
PARTONS_REVISION
}
"
)
string
(
REGEX REPLACE
"
\"
"
""
PARTONS_REVISION
"
${
PARTONS_REVISION
}
"
)
string
(
STRIP
"
${
PARTONS_REVISION
}
"
PARTONS_REVISION
)
configure_file
(
"
${
CMAKE_SOURCE_DIR
}
/bin/environment_configuration.dat.in"
"
${
CMAKE_SOURCE_DIR
}
/bin/environment_configuration.dat"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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