Skip to content

Commit

Permalink
fix some installation paths
Browse files Browse the repository at this point in the history
Use GNUInstallDirs variable throughout the build system.

Bug: ampas#100
Signed-off-by: Bernd Waibel <[email protected]>
  • Loading branch information
waebbl committed Jan 12, 2023
1 parent 2483047 commit ae04576
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
6 changes: 3 additions & 3 deletions OpenEXR_CTL/CtlModules/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
install(
install(
FILES
utilities.ctl
DESTINATION
${INSTALL_LIB_DIR}/CTL
DESTINATION
${CMAKE_INSTALL_DATADIR}/CTL
)

4 changes: 2 additions & 2 deletions OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ target_link_libraries (exr_ctl_exr
#target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
#target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )

install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} )
install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} )

install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_DATADIR}/CTL )
4 changes: 2 additions & 2 deletions OpenEXR_CTL/exrdpx/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ target_link_libraries (exrdpx
#target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
#target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )

install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} )
install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} )

install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_DATADIR}/CTL )


2 changes: 1 addition & 1 deletion lib/IlmImfCtl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ target_link_libraries (IlmImfCtl
install(FILES
ImfCtlApplyTransforms.h
DESTINATION
${CMAKE_INSTALL_LIBDIR}/OpenEXR
${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR
)

install(TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR})

0 comments on commit ae04576

Please sign in to comment.