646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
Remove upstream workarounds for CMake "limitations" that do not appear to exist
|
|
in nixpkgs build environment, but rather break the build, presumably because
|
|
CMAKE_INSTALL_{BIN,LIB}DIR is an absolute path in our build so
|
|
CMAKE_INSTALL_PREFIX has no effect.
|
|
|
|
diff --git a/devices/CMakeLists.txt b/devices/CMakeLists.txt
|
|
index d5111cd..43986ad 100644
|
|
--- a/devices/CMakeLists.txt
|
|
+++ b/devices/CMakeLists.txt
|
|
@@ -53,7 +53,6 @@ if(OIDN_DEVICE_CUDA)
|
|
-DCMAKE_CXX_COMPILER:FILEPATH=${_host_compiler}
|
|
-DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
|
|
-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
|
|
- -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall
|
|
-DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
|
|
-DCMAKE_INSTALL_LIBDIR:PATH=${CMAKE_INSTALL_LIBDIR}
|
|
-DCUDAToolkit_ROOT:PATH=${CUDAToolkit_ROOT}
|
|
@@ -69,14 +68,6 @@ if(OIDN_DEVICE_CUDA)
|
|
DEPENDS
|
|
OpenImageDenoise_core
|
|
)
|
|
-
|
|
- # Due to limitations of CMake, the module is pre-installed at build time to a temporary location,
|
|
- # and then copied to the real install location at install time.
|
|
- install(DIRECTORY
|
|
- ${CMAKE_CURRENT_BINARY_DIR}/cuda/preinstall/
|
|
- DESTINATION "."
|
|
- USE_SOURCE_PERMISSIONS
|
|
- )
|
|
endif()
|
|
|
|
if(OIDN_DEVICE_HIP)
|