Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable installation of vtkAddon #6

Merged
merged 4 commits into from
Apr 2, 2020
Merged

Conversation

RafaelPalomar
Copy link

@RafaelPalomar RafaelPalomar commented Mar 27, 2020

These changes will enable the installation of vtkAddon.

In addition, bf189a1 adds the vtkMacroKitPythonWrap.cmake file needed to build vtkAddon as a standalone project; this commit has been subject to discussion and might not be accepted in this pull as discussed in https://discourse.slicer.org/t/python-wrapping-on-the-new-external-vtkaddon/10826.

The installation tree on linux with these changes is as follows:

/usr/include/vtkAddon/vtkAddon.h
/usr/include/vtkAddon/vtkAddonConfigure.h
/usr/include/vtkAddon/vtkAddonExport.h
/usr/include/vtkAddon/vtkAddonMathUtilities.h
/usr/include/vtkAddon/vtkAddonSetGet.h
/usr/include/vtkAddon/vtkAddonTestingMacros.h
/usr/include/vtkAddon/vtkAddonTestingUtilities.h
/usr/include/vtkAddon/vtkAddonTestingUtilities.txx
/usr/include/vtkAddon/vtkErrorSink.h
/usr/include/vtkAddon/vtkLoggingMacros.h
/usr/include/vtkAddon/vtkOpenGLShaderComputation.h
/usr/include/vtkAddon/vtkOpenGLTextureImage.h
/usr/include/vtkAddon/vtkOrientedBSplineTransform.h
/usr/include/vtkAddon/vtkOrientedGridTransform.h
/usr/include/vtkAddon/vtkPersonInformation.h
/usr/include/vtkAddon/vtkRawRGBVolumeCodec.h
/usr/include/vtkAddon/vtkStreamingVolumeCodec.h
/usr/include/vtkAddon/vtkStreamingVolumeCodecFactory.h
/usr/include/vtkAddon/vtkStreamingVolumeFrame.h
/usr/include/vtkAddon/vtkTestingOutputWindow.h
/usr/lib64/cmake/vtkAddon/vtkAddonConfig.cmake
/usr/lib64/libvtkAddon.so
/usr/lib64/libvtkAddonPythonD.so
/usr/lib64/python3.6/site-packages/vtkAddonPython.so
/usr/share/doc/vtkAddon-9999/README.md.bz2

given the following configuration:

-DBUILD_SHARED_LIBS:BOOL=ON
-DBUILD_TESTING:BOOL=OFF
-DvtkAddon_WRAP_PYTHON:BOOL=ON
-DvtkAddon_INSTALL_NO_DEVELOPMENT:BOOL=OFF
-DvtkAddon_INSTALL_LIB_DIR:STRING="/usr/lib64"
-DvtkAddon_INSTALL_CMAKE_DIR:STRING="/usr/lib64/cmake/vtkAddon"
-DvtkAddon_INSTALL_PYTHON_MODULE_LIB_DIR:STRING="/usr/lib64/python3.6/site-packages"
-DvtkAddon_INSTALL_PYTHON_LIB_DIR:STRING="/usr/lib64"

Rafael Palomar added 3 commits March 27, 2020 20:01
- Globbing of pattern "*.(h|txx)" does not seem to work. Globbing
pattern separated in two patterns "*.h" and "*.txx"

- Adding the ${PROJECT_NAME}_INSTALL_INCLUDE_DIR variable accounting
for the install path for development files
- Added new variables (${PROJECT_NAME}_PYTHON_MODULE_LIB_DIR and
${PROJECT_NAME}_INSTALL_PYTHON_LIB_DIR) accounting for paths
corresponding to python library modules files and python libraries files.
- Creation of vtkAddonInstallConfig.cmake.in templated file

- Configuration of install config file

- Installation of configuratio file

- Adding a new variable ${PROJECT_NAME}_INSTALL_CMAKE_DIR to account
for the project's 'installation cmake dir
Copy link
Member

@jcfr jcfr left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the patches 🙏

Beside of updating the commit message, looks good.

CMake/vtkMacroKitPythonWrap.cmake Show resolved Hide resolved
@jcfr
Copy link
Member

jcfr commented Mar 27, 2020

One last change:

COMP: Fix build of python wrapping as a standalone project 

->

COMP: Fix build of python wrapping as a standalone project 

This commit adds a copy of the CMake module vtkMacroKitPythonWrap based of Slicer/Slicer@78a71cd9a

This commit adds a copy of the CMake module vtkMacroKitPythonWrap based of Slicer/Slicer@78a71cd9a
@RafaelPalomar
Copy link
Author

@jcfr should we close this one ;)

@jcfr
Copy link
Member

jcfr commented Apr 2, 2020

should we close this one ;)

I will move forward with integrating this PR and will create an other issue to capture the fact the install tree should be relocatable.

@jcfr jcfr merged commit 965cb2e into Slicer:master Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants