Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dune-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
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
Core Modules
dune-common
Commits
c84399bc
Commit
c84399bc
authored
5 years ago
by
Christoph Grüninger
Browse files
Options
Downloads
Patches
Plain Diff
[cmake] Remove deprecated inkscape_generate_png_from_svg
parent
20b1d710
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!763
[cmake] Remove deprecated UseLATEX.cmake
Pipeline
#24407
passed
5 years ago
Stage: test
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+8
-0
8 additions, 0 deletions
CHANGELOG.md
cmake/modules/UseInkscape.cmake
+0
-32
0 additions, 32 deletions
cmake/modules/UseInkscape.cmake
with
8 additions
and
32 deletions
CHANGELOG.md
+
8
−
0
View file @
c84399bc
...
...
@@ -3,6 +3,14 @@
-
Previous versions of dune-common imported
`std::shared_ptr`
and
`std::make_shared`
into the
`Dune`
namespace. dune-common-2.8 stops doing that.
## build-system
-
Remove the CMake function deprecated
`inkscape_generate_png_from_svg`
.
-
Remove the old and deprecated use of UseLATEX.cmake.
`dune_add_latex_document' is a redirection to `
add_latex_document
`
which internally uses `
latexmk
`.
# Release 2.7
- Added fallback implementation to C++20 feature: `
std::identity
`.
...
...
This diff is collapsed.
Click to expand it.
cmake/modules/UseInkscape.cmake
+
0
−
32
View file @
c84399bc
...
...
@@ -22,13 +22,6 @@
#
# TODO Switch to named arguments!
#
#
# .. cmake_function:: inkscape_generate_eps_from_svg
#
# .. deprecated:: 2.7
# Switch to PNG instead of EPS and use
# inkscape_generate_png_from_svg.
#
include
(
CMakeParseArguments
)
...
...
@@ -51,28 +44,3 @@ function(inkscape_generate_png_from_svg)
WORKING_DIRECTORY
${
INKSCAPE_OUTPUT_DIR
}
)
endforeach
()
endfunction
()
function
(
inkscape_generate_eps_from_svg
)
message
(
AUTHOR_WARNING
"inkscape_generate_eps_from_svg is deprecated and will be removed after Dune 2.7."
)
cmake_parse_arguments
(
INKSCAPE
""
"INPUT_DIR;OUTPUT_DIR;DPI"
""
${
ARGN
}
)
if
(
NOT INKSCAPE_INPUT_DIR
)
set
(
INKSCAPE_INPUT_DIR
${
CMAKE_CURRENT_SOURCE_DIR
}
)
endif
()
if
(
NOT INKSCAPE_INPUT_DIR
)
set
(
INKSCAPE_OUTPUT_DIR
${
CMAKE_CURRENT_BINARY_DIR
}
)
endif
()
foreach
(
_pic
${
INKSCAPE_UNPARSED_ARGUMENTS
}
)
string
(
REGEX REPLACE
"
\\
.[a-zA-Z]+"
".png"
input
"
${
_pic
}
"
)
string
(
REGEX REPLACE
"
\\
.[a-zA-Z]+"
".svg"
svginput
"
${
_pic
}
"
)
add_custom_target
(
${
input
}
COMMAND
${
INKSCAPE
}
-z --export-dpi=
${
INKSCAPE_DPI
}
-e
${
input
}
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
svginput
}
COMMENT
"Generating
${
INKSCAPE_OUTPUT_DIR
}
/
${
svginput
}
from
${
CMAKE_CURRENT_SOURCE_DIR
}
/
${
input
}
"
)
add_custom_command
(
OUTPUT
${
_pic
}
COMMAND
${
CONVERT
}
${
INKSCAPE_OUTPUT_DIR
}
/
${
input
}
EPS:
${
_pic
}
DEPENDS
${
input
}
COMMENT
"Converting
${
INKSCAPE_OUTPUT_DIR
}
/
${
input
}
to
${
INKSCAPE_OUTPUT_DIR
}
/
${
_pic
}
"
WORKING_DIRECTORY
${
INKSCAPE_OUTPUT_DIR
}
)
endforeach
()
endfunction
()
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