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.

Sign up for GitHub

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

Jump to bottom

Remove OpenEXR_Viewers from the cmake build files and from INSTALL.md #676

Merged
merged 2 commits into from
Mar 5, 2020
Merged

Remove OpenEXR_Viewers from the cmake build files and from INSTALL.md #676

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efd260c
Remove OpenEXR_Viewers from the cmake build files and from the INSTAL…
cary-ilm Feb 27, 2020
bc9a201
Merge branch 'master' into viewers-fix
cary-ilm Mar 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,6 @@ if(PYILMBASE_ENABLE)
endif()
endif()

option(OPENEXR_VIEWERS_ENABLE "Enables configuration of the viewers module" ON)
if(OPENEXR_VIEWERS_ENABLE)
add_subdirectory(OpenEXR_Viewers)
endif()

# Including this module will add a `clang-format` target to the build if
# the clang-format executable can be found.
include(cmake/clang-format.cmake)
12 changes: 6 additions & 6 deletions INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,11 +108,11 @@ configuration files included with find_package should set this up.

## Sub-Modules

OpenEXR consists of four separate sub-modules - IlmBase, PyIlmBase,
OpenEXR, OpenEXR_Viewers - which can be built independently. The
repository’s top-level CMakeLists.txt defines a *super-project* that
builds all four modules, and the steps above for running cmake at the
top level of the repo build each of the sub-modules, in parallel.
OpenEXR consists of three separate sub-modules - IlmBase, PyIlmBase,
and OpenEXR - which can be built independently. The repository’s
top-level CMakeLists.txt defines a *super-project* that builds all
four modules, and the steps above for running cmake at the top level
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this then be builds all three modules or just builds all modules?

Copy link
Member Author

Choose a reason for hiding this comment

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

Oops, good catch, thanks.

of the repo build each of the sub-modules, in parallel.

However you can build each submodule individually. To build and
install individual sub-modules, build and install the IlmBase module
Expand All @@ -135,7 +135,7 @@ which to install OpenEXR:
$source_directory/OpenEXR
% cmake --build . --target install --config Release

Optionally, then build and install PyIlmBase, OpenEXR_Viewers, and Contrib.
Optionally, then build and install PyIlmBase

The libraries in IlmBase and OpenEXR follow the standard cmake setting
of ``BUILD_SHARED_LIBS`` to control whether to build static or shared
Expand Down