Skip to content

Commit

Permalink
The OPENEXR_INSTALL option needs to be defined before it's used (#959)
Browse files Browse the repository at this point in the history
This was causing OpenEXR builds (since #955 was merged) to
NOT INSTALL. Oh boy.

Signed-off-by: Larry Gritz <lg@larrygritz.com>
  • Loading branch information
lgritz authored Mar 13, 2021
1 parent 5b210d0 commit 338d39f
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,12 @@ add_subdirectory(cmake)
# Add all source in subdirectories
#######################################

option(OPENEXR_INSTALL "Install OpenEXR libraries" ON)
option(OPENEXR_INSTALL_TOOLS "Install OpenEXR tools" ON)
if(OPENEXR_INSTALL_TOOLS AND NOT OPENEXR_INSTALL)
message(SEND_ERROR "OPENEXR_INSTALL_TOOLS requires OPENEXR_INSTALL")
endif()

# Include these two modules without enable/disable options
add_subdirectory(src/lib)
add_subdirectory(src/bin)
Expand All @@ -48,12 +54,6 @@ if(OPENEXR_INSTALL_EXAMPLES)
add_subdirectory( src/examples )
endif()

option(OPENEXR_INSTALL "Install OpenEXR libraries" ON)
option(OPENEXR_INSTALL_TOOLS "Install OpenEXR tools" ON)
if(OPENEXR_INSTALL_TOOLS AND NOT OPENEXR_INSTALL)
message(SEND_ERROR "OPENEXR_INSTALL_TOOLS requires OPENEXR_INSTALL")
endif()

# If you want to use ctest to configure, build and
# upload the results, cmake has builtin support for
# submitting to CDash, or any server who speaks the
Expand Down

0 comments on commit 338d39f

Please sign in to comment.