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
b9f9cbdb
Commit
b9f9cbdb
authored
May 07, 2020
by
Guilhem Saurel
Browse files
[CMake] fix PACKAGE_EXTRA_MACROS use
parent
a165e5a9
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
b9f9cbdb
...
...
@@ -15,10 +15,6 @@ SET(PROJECT_USE_CMAKE_EXPORT TRUE)
SET
(
CUSTOM_HEADER_DIR
${
PROJECT_NAME
}
)
SET
(
CXX_DISABLE_WERROR TRUE
)
SET
(
DOXYGEN_USE_MATHJAX 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
)
...
...
@@ -141,6 +137,11 @@ 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
)
...
...
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