Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Stack Of Tasks
dynamic-graph
Commits
9d2d74ed
Commit
9d2d74ed
authored
May 11, 2020
by
Guilhem Saurel
Browse files
Merge branch 'master' into devel
parents
8be0de7e
0a0da890
Pipeline
#9527
passed with stage
in 4 minutes and 39 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
9d2d74ed
...
...
@@ -19,11 +19,6 @@ SET(CXX_DISABLE_WERROR TRUE)
SET
(
DOXYGEN_USE_MATHJAX YES
)
SET
(
DOXYGEN_USE_TEMPLATE_CSS YES
)
SET
(
DYNAMIC_GRAPH_PLUGINDIR
"
${
CMAKE_INSTALL_PREFIX
}
/lib/
${
PROJECT_NAME
}
-plugins"
)
SET
(
PACKAGE_EXTRA_MACROS
"set(DYNAMIC_GRAPH_PLUGINDIR
${
DYNAMIC_GRAPH_PLUGINDIR
}
)"
)
SET
(
PKG_CONFIG_EXTRA
"plugindir=
${
DYNAMIC_GRAPH_PLUGINDIR
}
"
)
SET
(
CMAKE_INSTALL_RPATH
"
${
DYNAMIC_GRAPH_PLUGINDIR
}
"
)
# JRL-cmakemodule setup
INCLUDE
(
cmake/base.cmake
)
INCLUDE
(
cmake/boost.cmake
)
...
...
@@ -145,6 +140,12 @@ ENDIF(SUFFIX_SO_VERSION)
INSTALL
(
TARGETS
${
PROJECT_NAME
}
EXPORT
${
TARGETS_EXPORT_NAME
}
DESTINATION lib
)
SET
(
DYNAMIC_GRAPH_PLUGINDIR
"
${
CMAKE_INSTALL_PREFIX
}
/lib/
${
PROJECT_NAME
}
-plugins"
)
SET
(
PACKAGE_EXTRA_MACROS
"set(DYNAMIC_GRAPH_PLUGINDIR
${
DYNAMIC_GRAPH_PLUGINDIR
}
)"
)
SET
(
PKG_CONFIG_EXTRA
"plugindir=
${
DYNAMIC_GRAPH_PLUGINDIR
}
"
)
SET
(
CMAKE_INSTALL_RPATH
"
${
DYNAMIC_GRAPH_PLUGINDIR
}
"
)
ADD_SUBDIRECTORY
(
src
)
ADD_SUBDIRECTORY
(
tests
)
...
...
cmake
@
72cf8cde
Compare
321eb1cc
...
72cf8cde
Subproject commit
321eb1ccf1d94570eb564f3659b13ef3ef82239e
Subproject commit
72cf8cdefcf8cde818745ad7998122bde0b54734
package.xml
View file @
9d2d74ed
<package
format=
"2"
>
<name>
dynamic-graph
</name>
<version>
4.
0
.0
</version>
<version>
4.
1
.0
</version>
<description>
Dynamic graph library
</description>
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment