From dd4417239f70379d07928c6c3834ffa54a7765e4 Mon Sep 17 00:00:00 2001
From: Sebastian <sebastian@friendlyshade.com>
Date: Thu, 25 Jan 2024 03:16:18 -0500
Subject: [PATCH] Fix files from different configurations overwriting on
 installation

---
 api/CMakeLists.txt         | 6 +++---
 apps/CMakeLists.txt        | 2 +-
 cmake/oidn_dnnl.cmake      | 2 +-
 cmake/oidn_macros.cmake    | 4 ++--
 core/CMakeLists.txt        | 6 +++---
 devices/cpu/CMakeLists.txt | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/api/CMakeLists.txt b/api/CMakeLists.txt
index 7846d897f..5741fb485 100644
--- a/api/CMakeLists.txt
+++ b/api/CMakeLists.txt
@@ -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
 )
\ No newline at end of file
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
index 9caeec92d..19eb9ed2c 100644
--- a/apps/CMakeLists.txt
+++ b/apps/CMakeLists.txt
@@ -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)
diff --git a/cmake/oidn_dnnl.cmake b/cmake/oidn_dnnl.cmake
index 97c5b502b..5dc8fd4aa 100644
--- a/cmake/oidn_dnnl.cmake
+++ b/cmake/oidn_dnnl.cmake
@@ -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()
\ No newline at end of file
diff --git a/cmake/oidn_macros.cmake b/cmake/oidn_macros.cmake
index c1adf3e1c..5f9ca1437 100644
--- a/cmake/oidn_macros.cmake
+++ b/cmake/oidn_macros.cmake
@@ -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()
 
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index ef03af508..d9810a700 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -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
 )
\ No newline at end of file
diff --git a/devices/cpu/CMakeLists.txt b/devices/cpu/CMakeLists.txt
index 3628c453b..08993524d 100644
--- a/devices/cpu/CMakeLists.txt
+++ b/devices/cpu/CMakeLists.txt
@@ -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)