Skip to content
GitLab
Menu
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
sot-dynamic-pinocchio
Commits
d07e4240
Commit
d07e4240
authored
Jul 28, 2010
by
Francois Bleibel
Browse files
Removed default library for sot-dynamic (it's only made of entities)
parent
c085963f
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
d07e4240
...
...
@@ -182,6 +182,29 @@ ELSE(PACKAGE_REQUIREMENTS STREQUAL "")
SET
(
PACKAGE_REQUIREMENTS
"
${
PACKAGE_REQUIREMENTS
}
,
${
MATRIXABSTRACTLAYER_REQUIRED
}
"
)
ENDIF
(
PACKAGE_REQUIREMENTS STREQUAL
""
)
#
# Dependency to package dynamic-graph
#
SET
(
DYNAMIC_GRAPH_FOUND 0
)
SET
(
DYNAMIC_GRAPH_REQUIRED
"dynamic-graph >= 1.0"
)
PKG_CHECK_MODULES
(
DYNAMIC_GRAPH REQUIRED
${
DYNAMIC_GRAPH_REQUIRED
}
)
EXEC_PROGRAM
(
${
PKG_CONFIG_EXECUTABLE
}
ARGS --variable=docdir dynamic-graph
OUTPUT_VARIABLE DYNAMIC_GRAPH_DOCDIR
)
MESSAGE
(
STATUS
"pkg-config:
${
PKG_CONFIG_EXECUTABLE
}
"
)
MESSAGE
(
STATUS
"DYNAMIC_GRAPH_DOCDIR=
${
DYNAMIC_GRAPH_DOCDIR
}
"
)
SET
(
DYNAMIC_GRAPH_FOUND 1
)
IF
(
NOT
${
DYNAMIC_GRAPH_FOUND
}
)
MESSAGE
(
FATAL_ERROR
"Check that package dynamic-graph is installed in a directory pointed out by PKG_CONFIG_PATH."
)
ENDIF
(
NOT
${
DYNAMIC_GRAPH_FOUND
}
)
IF
(
PACKAGE_REQUIREMENTS STREQUAL
""
)
SET
(
PACKAGE_REQUIREMENTS
${
DYNAMIC_GRAPH_REQUIRED
}
)
ELSE
(
PACKAGE_REQUIREMENTS STREQUAL
""
)
SET
(
PACKAGE_REQUIREMENTS
"
${
PACKAGE_REQUIREMENTS
}
,
${
DYNAMIC_GRAPH_REQUIRED
}
"
)
ENDIF
(
PACKAGE_REQUIREMENTS STREQUAL
""
)
#
# pkg-config file
#
...
...
@@ -193,11 +216,11 @@ SET(install_pkg_datarootdir "\${datarootdir}")
SET
(
install_pkg_include_dir
"
\$
{includedir}"
)
IF
(
UNIX
)
SET
(
${
PROJECT_NAME
}
_LDFLAGS
"-Wl,-R
${
install_pkg_libdir
}
${
LIBINCL_KW
}${
PROJECT_NAME
}${
LIB_EXT
}
${${
PROJECT_NAME
}
_LDFLAGS
}
"
)
SET
(
${
PROJECT_NAME
}
_LDFLAGS
"-Wl,-R
${
install_pkg_libdir
}
${${
PROJECT_NAME
}
_LDFLAGS
}
"
)
ENDIF
(
UNIX
)
IF
(
WIN32
)
SET
(
${
PROJECT_NAME
}
_LDFLAGS
"
${
LIBINCL_KW
}${
PROJECT_NAME
}${
LIB_EXT
}
${${
PROJECT_NAME
}
_LDFLAGS
}
"
)
SET
(
${
PROJECT_NAME
}
_LDFLAGS
"
${${
PROJECT_NAME
}
_LDFLAGS
}
"
)
ENDIF
(
WIN32
)
# Install the file in the appropriate place.
...
...
src/CMakeLists.txt
View file @
d07e4240
...
...
@@ -51,9 +51,6 @@ IF(${DYNAMICSJRLJAPAN_FOUND})
ENDIF
(
${
DYNAMICSJRLJAPAN_FOUND
}
)
IF
(
${
_hrp210optimized_FOUND
}
)
MESSAGE
(
STATUS
"A MODIFIER"
)
LIST
(
APPEND libs dynamic-hrp2_10
)
SET
(
dynamic-hrp2_10_plugins_dependencies dynamic
)
SET
(
dynamic-hrp2_10_plugins_compile_flags
...
...
Write
Preview
Supports
Markdown
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