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

Fix files from different configurations overwriting on installation #192

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix files from different configurations overwriting on installation #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions api/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ install(TARGETS OpenImageDenoise
EXPORT
OpenImageDenoise_Exports
ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>" COMPONENT devel
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>" COMPONENT devel
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT lib
DESTINATION "${CMAKE_INSTALL_BINDIR}/$<CONFIG>" COMPONENT lib
)
2 changes: 1 addition & 1 deletion apps/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ add_subdirectory(utils)
macro(oidn_add_app APP_NAME)
add_executable(${APP_NAME} ${ARGN} ${OIDN_RESOURCE_FILE})
target_link_libraries(${APP_NAME} PRIVATE OpenImageDenoise_common OpenImageDenoise_utils OpenImageDenoise)
install(TARGETS ${APP_NAME} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT apps)
install(TARGETS ${APP_NAME} DESTINATION "${CMAKE_INSTALL_BINDIR}/$<CONFIG>" COMPONENT apps)
endmacro()

oidn_add_app(oidnDenoise oidnDenoise.cpp)
Expand Down
2 changes: 1 addition & 1 deletion cmake/oidn_dnnl.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,6 @@ if(OIDN_STATIC_LIB)
EXPORT
OpenImageDenoise_Exports
ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>" COMPONENT devel
)
endif()
4 changes: 2 additions & 2 deletions cmake/oidn_macros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ endfunction()
function(oidn_install_module target)
install(TARGETS ${target}
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>" COMPONENT devel
NAMELINK_SKIP
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT lib
DESTINATION "${CMAKE_INSTALL_BINDIR}/$<CONFIG>" COMPONENT lib
)
endfunction()

Expand Down
6 changes: 3 additions & 3 deletions core/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ install(TARGETS OpenImageDenoise_core
EXPORT
OpenImageDenoise_Exports
ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>" COMPONENT devel
LIBRARY
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>" COMPONENT devel
NAMELINK_SKIP
RUNTIME
DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT lib
DESTINATION "${CMAKE_INSTALL_BINDIR}/$<CONFIG>" COMPONENT lib
)
2 changes: 1 addition & 1 deletion devices/cpu/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ if(OIDN_STATIC_LIB)
EXPORT
OpenImageDenoise_Exports
ARCHIVE
DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT devel
DESTINATION "${CMAKE_INSTALL_LIBDIR}/$<CONFIG>" COMPONENT devel
)

target_link_libraries(OpenImageDenoise PRIVATE OpenImageDenoise_device_cpu)
Expand Down