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
Guilhem Saurel
pinocchio
Commits
74739acf
Commit
74739acf
authored
Oct 14, 2016
by
jcarpent
Browse files
[CMake] Use ADD_COMPILE_DEPENDENCY
parent
07f85061
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
74739acf
...
@@ -42,16 +42,6 @@ IF(APPLE)
...
@@ -42,16 +42,6 @@ IF(APPLE)
endif
(
"
${
isSystemDir
}
"
STREQUAL
"-1"
)
endif
(
"
${
isSystemDir
}
"
STREQUAL
"-1"
)
ENDIF
(
APPLE
)
ENDIF
(
APPLE
)
# This should go to jrl-cmakemodules if accepted - Similar to ADD_DOC_DEPENDENC but with a requiered option
# This macro is for requiered components which must not appear as a dependence of the main library
MACRO
(
ADD_SEPARATE_DEPENDENCY PKG_CONFIG_STRING
)
SET
(
PKG_CONFIG_DEBUG_STRING
""
)
FOREACH
(
ARG
${
ARGN
}
)
SET
(
PKG_CONFIG_DEBUG_STRING
${
ARG
}
)
ENDFOREACH
()
ADD_DEPENDENCY
(
0 1
${
PKG_CONFIG_STRING
}
"
${
PKG_CONFIG_DEBUG_STRING
}
"
)
ENDMACRO
(
ADD_SEPARATE_DEPENDENCY
)
# Disable -Werror on Unix for now.
# Disable -Werror on Unix for now.
SET
(
CXX_DISABLE_WERROR True
)
SET
(
CXX_DISABLE_WERROR True
)
SET
(
CMAKE_VERBOSE_MAKEFILE True
)
SET
(
CMAKE_VERBOSE_MAKEFILE True
)
...
...
bindings/python/CMakeLists.txt
View file @
74739acf
...
@@ -54,7 +54,7 @@ ENDMACRO(SYMLINK_AND_INSTALL_HEADERS HEADERS SUBPATH)
...
@@ -54,7 +54,7 @@ ENDMACRO(SYMLINK_AND_INSTALL_HEADERS HEADERS SUBPATH)
# --- DEPENDENCIES --- #
# --- DEPENDENCIES --- #
SET
(
PKG_CONFIG_PYWRAP_REQUIRES
"eigenpy >= 1.3.1"
)
SET
(
PKG_CONFIG_PYWRAP_REQUIRES
"eigenpy >= 1.3.1"
)
FOREACH
(
dep
${
PKG_CONFIG_PYWRAP_REQUIRES
}
)
FOREACH
(
dep
${
PKG_CONFIG_PYWRAP_REQUIRES
}
)
ADD_
SEPARAT
E_DEPENDENCY
(
${
dep
}
)
ADD_
COMPIL
E_DEPENDENCY
(
${
dep
}
)
ENDFOREACH
(
dep
${
PKG_CONFIG_PYWRAP_REQUIRES
}
)
ENDFOREACH
(
dep
${
PKG_CONFIG_PYWRAP_REQUIRES
}
)
# --- LIBRARY --- #
# --- LIBRARY --- #
...
...
cmake
@
c8ae5972
Compare
7927aefd
...
c8ae5972
Subproject commit
7927aefd4e5e6aec7dc22d243e121c3f9c7c1f99
Subproject commit
c8ae5972e825bc27bf978f142b81915df19fef70
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