Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
94cb834d
Commit
94cb834d
authored
May 14, 2016
by
Emmanuel Promayon
Committed by
Jean-Loup Haberbusch
Jul 22, 2016
Browse files
add_dependency to camitkcore target not needed outside sdk
parent
d6838b80
Changes
2
Hide whitespace changes
Inline
Side-by-side
sdk/cmake/modules/macros/camitk/CamiTKApplication.cmake
View file @
94cb834d
...
...
@@ -349,9 +349,13 @@ macro(camitk_application)
#########################################################################
# 1st CAMITKCORE LIBRARY DEPENDENCY
add_dependencies
(
${
APPLICATION_TARGET_NAME
}
${
CAMITK_CORE_TARGET_LIB_NAME
}
)
# add the dependency to the core automoc target
set_property
(
TARGET
${
APPLICATION_TARGET_NAME
}
APPEND PROPERTY AUTOGEN_TARGET_DEPENDS
${
CAMITK_CORE_TARGET_LIB_NAME
}
)
# add the target dependency (i.e., enable proper parallelization of the build process
# only if inside the sdk build
if
(
CAMITK_SDK_BUILD
)
add_dependencies
(
${
APPLICATION_TARGET_NAME
}
${
CAMITK_CORE_TARGET_LIB_NAME
}
)
# add the dependency to the core automoc target
set_property
(
TARGET
${
APPLICATION_TARGET_NAME
}
APPEND PROPERTY AUTOGEN_TARGET_DEPENDS
${
CAMITK_CORE_TARGET_LIB_NAME
}
)
endif
()
# 2nd COMPONENTS DEPENDENCIES
if
(
${
APPLICATION_NAME_CMAKE
}
_NEEDS_COMPONENT_EXTENSION
)
...
...
sdk/cmake/modules/macros/camitk/CamiTKLibrary.cmake
View file @
94cb834d
...
...
@@ -361,7 +361,7 @@ macro(camitk_library)
set
(
LIBRARIES_DEPENDENCY_LIST
""
)
#use for generating the project.xml file
if
(
${
DEFAULT_LIBRARY_NAME_CMAKE
}
_NEEDS_CEP_LIBRARIES
)
foreach
(
CEP_LIBRARY_NEEDED
${${
DEFAULT_LIBRARY_NAME_CMAKE
}
_NEEDS_CEP_LIBRARIES
}
)
# include directories from build, camitk (local or global install).
# include directories from build, camitk (local or global install).
include_directories
(
${
CAMITK_BUILD_INCLUDE_DIR
}
/libraries/
${
CEP_LIBRARY_NEEDED
}
)
include_directories
(
${
CAMITK_INCLUDE_DIR
}
/libraries/
${
CEP_LIBRARY_NEEDED
}
)
# file dependency
...
...
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