Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
d6af055c
Commit
d6af055c
authored
Jun 11, 2020
by
Daniel Black
Committed by
Marko Mäkelä
Jun 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-22864: cmake/libutils account for cmake-2.8.12.1
That doesn't support STRING(APPEND ..)
parent
ade0f40f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
3 deletions
+2
-3
cmake/libutils.cmake
cmake/libutils.cmake
+2
-3
No files found.
cmake/libutils.cmake
View file @
d6af055c
...
@@ -207,10 +207,9 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
...
@@ -207,10 +207,9 @@ MACRO(MERGE_STATIC_LIBS TARGET OUTPUT_NAME LIBS_TO_MERGE)
SET
(
SCRIPT_CONTENTS
"CREATE $<TARGET_FILE:
${
TARGET
}
>
\n
"
)
SET
(
SCRIPT_CONTENTS
"CREATE $<TARGET_FILE:
${
TARGET
}
>
\n
"
)
FOREACH
(
LIB
${
STATIC_LIBS
}
)
FOREACH
(
LIB
${
STATIC_LIBS
}
)
S
TRING
(
APPEND SCRIPT_CONTENTS
"
ADDLIB
${
LIB
}
\n
"
)
S
ET
(
SCRIPT_CONTENTS
"
${
SCRIPT_CONTENTS
}
\n
ADDLIB
${
LIB
}
\n
"
)
ENDFOREACH
()
ENDFOREACH
()
STRING
(
APPEND SCRIPT_CONTENTS
"SAVE
\n
END
\n
"
)
FILE
(
WRITE
${
MRI_SCRIPT_TPL
}
"
${
SCRIPT_CONTENTS
}
\n
SAVE
\n
END
\n
"
)
FILE
(
WRITE
${
MRI_SCRIPT_TPL
}
"
${
SCRIPT_CONTENTS
}
"
)
FILE
(
GENERATE OUTPUT
${
MRI_SCRIPT
}
INPUT
${
MRI_SCRIPT_TPL
}
)
FILE
(
GENERATE OUTPUT
${
MRI_SCRIPT
}
INPUT
${
MRI_SCRIPT_TPL
}
)
ADD_CUSTOM_COMMAND
(
TARGET
${
TARGET
}
POST_BUILD
ADD_CUSTOM_COMMAND
(
TARGET
${
TARGET
}
POST_BUILD
...
...
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