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
Christian Butz
VTK
Commits
31857c7e
Commit
31857c7e
authored
Apr 21, 2011
by
David Partyka
Browse files
Merge branch 'vtkconfig-vtk-libraries' into release
parents
53e1a2c8
36414a53
Changes
3
Hide whitespace changes
Inline
Side-by-side
CMake/KitCommonBlock.cmake
View file @
31857c7e
...
...
@@ -6,6 +6,11 @@ VTK_MAKE_INSTANTIATOR3(vtk${KIT}Instantiator KitInstantiator_SRCS
VTK_ADD_LIBRARY
(
vtk
${
KIT
}
${
Kit_SRCS
}
${
Kit_EXTRA_SRCS
}
${
KitInstantiator_SRCS
}
)
SET
(
KIT_LIBRARY_TARGETS
${
KIT_LIBRARY_TARGETS
}
vtk
${
KIT
}
)
# accumulate list of kit library target names
# we export these in VTKConfig as VTK_LIBRARIES.
set_property
(
GLOBAL APPEND PROPERTY VTK_LIBRARIES vtk
${
KIT
}
)
# Add target specific compile flags for ABI setttings
IF
(
VTK_ABI_CXX_FLAGS
)
SET_PROPERTY
(
TARGET vtk
${
KIT
}
APPEND
...
...
Utilities/LastConfigureStep/CMakeLists.txt
View file @
31857c7e
...
...
@@ -12,7 +12,7 @@
GET_PROPERTY
(
VTK_TARGETS GLOBAL PROPERTY VTK_TARGETS
)
EXPORT
(
TARGETS
${
VTK_TARGETS
}
FILE
${
VTK_BINARY_DIR
}
/
${
VTK_INSTALL_EXPORT_NAME
}
.cmake
)
INSTALL
(
EXPORT
${
VTK_INSTALL_EXPORT_NAME
}
DESTINATION
${
VTK_INSTALL_LIB_DIR_CM24
}
)
GET_PROPERTY
(
VTK_LIBRARIES GLOBAL PROPERTY VTK_LIBRARIES
)
#-----------------------------------------------------------------------------
# Create the VTKConfig.cmake file containing the VTK configuration.
# Since it might generate configuration file depending
...
...
VTKConfig.cmake.in
View file @
31857c7e
...
...
@@ -6,6 +6,9 @@
# to load VTK's settings for an external project.
@VTK_CONFIG_INSTALL_ONLY@
# The set of VTK libraries
SET(VTK_LIBRARIES "@VTK_LIBRARIES@")
# The VTK include file directories.
SET(VTK_INCLUDE_DIRS "@VTK_INCLUDE_DIRS_CONFIG@")
...
...
Write
Preview
Markdown
is supported
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