tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1Remove upstream workarounds for CMake "limitations" that do not appear to exist
2in nixpkgs build environment, but rather break the build, presumably because
3CMAKE_INSTALL_{BIN,LIB}DIR is an absolute path in our build so
4CMAKE_INSTALL_PREFIX has no effect.
5
6diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
7index d5111cd..43986ad 100644
8--- a/devices/CMakeLists.txt
9+++ b/devices/CMakeLists.txt
10@@ -53,7 +53,6 @@ if(OIDN_DEVICE_CUDA)
11 -DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler}
12 -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
13 -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
14- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall
15 -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
16 -DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
17 -DCUDAToolkit_ROOT:PATH=${CUDAToolkit_ROOT}
18@@ -69,14 +68,6 @@ if(OIDN_DEVICE_CUDA)
19 DEPENDS
20 OpenImageDenoise_core
21 )
22-
23- # Due to limitations of CMake, the module is pre-installed at build time to a temporary location,
24- # and then copied to the real install location at install time.
25- install(DIRECTORY
26- ${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall/
27- DESTINATION "."
28- USE_SOURCE_PERMISSIONS
29- )
30 endif()
31
32 if(OIDN_DEVICE_HIP)