From 6abe6d6694d2409e0bcb1ec49acc69e248b2ea3c Mon Sep 17 00:00:00 2001 From: Tuan Nghia Nguyen Date: Sat, 12 Sep 2026 23:38:48 +1000 Subject: [PATCH] fix(build): configure without CUDA instead of failing at generate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tests/CMakeLists.txt added every test directory unconditionally, so a machine with no CUDA toolkit — every macOS one — died at generate time on "links to CUDA::cudart but the target was not found", taking the cross-platform targets down with it. Gate each test the way its subject is already gated: the five that need the toolkit behind ANSCORE_HAS_CUDA, the ANSIO one behind WIN32, and the ANSONVIF one behind both. ANSONVIF itself uses no CUDA; its test names CUDA::cudart and CUDA::nvjpeg only because it drives capture through ANSCV and was copied from the ANSCV test. Two non-test targets had the same problem. ANSCV genuinely needs the toolkit — ANSGpuFrameOps.h includes unconditionally and calls cudaMemcpy2D/cudaMallocPitch — so it moves into the existing CUDA block beside the engine modules. ANSLibsLoader binds cudart at runtime and ships its own stubs, but still compiles against the runtime header for the types and links CUDA::cudart_static, so it is gated too. Also call enable_testing(), which the project never did: without it the add_test() under tests/ reached nothing and ctest found no tests. Plain enable_testing(), not include(CTest), to avoid its extra targets. A CUDA machine is unchanged: every gate holds there, ANSCV keeps its place in the subdirectory order, and the only new output is CTestTestfile.cmake. Co-Authored-By: Claude Opus 5 --- CMakeLists.txt | 15 +++++++++++++-- tests/CMakeLists.txt | 36 +++++++++++++++++++++++++++++------- 2 files changed, 42 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b0038ba..386bb2f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,7 +154,11 @@ include(cmake/Dependencies.cmake) # Core — licensing & infrastructure add_subdirectory(core/anslicensing) add_subdirectory(core/ANSLicensingSystem) -add_subdirectory(core/ANSLibsLoader) +# ANSLibsLoader dynamically binds cudart/cuBLAS/nvJPEG at runtime, but it still +# compiles against for their types and links CUDA::cudart_static. +if(ANSCORE_HAS_CUDA) + add_subdirectory(core/ANSLibsLoader) +endif() add_subdirectory(core/ANSModelPackage) # Modules — feature DLLs (cross-platform) @@ -178,11 +182,18 @@ if(ANSCORE_HAS_CUDA) add_subdirectory(modules/ANSOCR) add_subdirectory(modules/ANSFR) add_subdirectory(modules/ANSLPR) + # ANSCV hosts NVDEC decode, the NV12 GPU frame pool and the nvJPEG encoder: + # ANSGpuFrameOps.h includes unconditionally and calls + # cudaMemcpy2D/cudaMallocPitch directly, so it needs the toolkit like the + # engine modules do. + add_subdirectory(modules/ANSCV) endif() -add_subdirectory(modules/ANSCV) # Facade add_subdirectory(ANSLIB) # Tests +# enable_testing() (not include(CTest), which would add Nightly/Experimental +# targets) so the add_test() calls under tests/ reach ctest. +enable_testing() add_subdirectory(tests) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fdf0f47..144211f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,13 +1,35 @@ # ANSCORE Unit Tests -add_subdirectory(ANSCV-UnitTest) -add_subdirectory(ANSODEngine-UnitTest) -add_subdirectory(ANSFR-UnitTest) -add_subdirectory(ANSLPR-UnitTest) -add_subdirectory(ANSOCR-UnitTest) +# +# A test is gated exactly like the code it exercises (see the top-level +# CMakeLists): tests for the CUDA-only modules, or that name CUDA::* targets +# themselves, are added only when ANSCORE_HAS_CUDA; tests for the Windows-only +# integrations only on WIN32. Without these gates a non-CUDA configure (macOS, +# any machine with no toolkit) fails at generate time on "links to CUDA::cudart +# but the target was not found", which blocks the cross-platform targets too. + +# Cross-platform add_subdirectory(ANSUtilities-UnitTest) add_subdirectory(ANSRabbitMQ-UnitTest) -add_subdirectory(ANSIO-UnitTest) add_subdirectory(ANSLS-UnitTest) add_subdirectory(ANSModelPackage-UnitTest) -add_subdirectory(ANSONVIF-UnitTest) add_subdirectory(ANSODTRE-UnitTest) + +# Windows-only — integrations/ANSIO is built on WIN32 only +if(WIN32) + add_subdirectory(ANSIO-UnitTest) +endif() + +# CUDA-only — modules/ANSCV, ANSODEngine, ANSOCR, ANSFR and ANSLPR +if(ANSCORE_HAS_CUDA) + add_subdirectory(ANSCV-UnitTest) + add_subdirectory(ANSODEngine-UnitTest) + add_subdirectory(ANSFR-UnitTest) + add_subdirectory(ANSLPR-UnitTest) + add_subdirectory(ANSOCR-UnitTest) + + # integrations/ANSONVIF itself uses no CUDA — the test does, because it + # drives capture through ANSCV. Hence both gates. + if(WIN32) + add_subdirectory(ANSONVIF-UnitTest) + endif() +endif()