The package library's Windows branch pointed at vcpkg alone. On a real Windows build machine the header lives in the ANSLibs tree, so anything linking this library failed with "Cannot open include file: 'nlohmann/json.hpp'" while the engines compiled fine — they add ANSLibs to their own include path and never noticed. Now it is searched for by name, with the ANSLibs tree, vcpkg and the usual system paths as hints, and the configure says where it found it. One code path for every platform instead of an assumption per platform. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
44 lines
2.1 KiB
CMake
44 lines
2.1 KiB
CMake
# ANSModelPackage — reading an ANS model package (.ansmodel).
|
|
#
|
|
# Header-only apart from the vendored curves, and deliberately free of the
|
|
# heavy dependencies around it: no CUDA, no OpenCV, no LabVIEW. That is what
|
|
# lets it build — and be tested — on every platform, including the ones where
|
|
# the engine layer does not build at all.
|
|
add_library(ANSModelPackage STATIC
|
|
${CMAKE_SOURCE_DIR}/3rdparty/monocypher/monocypher.c
|
|
${CMAKE_SOURCE_DIR}/3rdparty/monocypher/monocypher-ed25519.c
|
|
)
|
|
|
|
target_include_directories(ANSModelPackage PUBLIC
|
|
${CMAKE_CURRENT_SOURCE_DIR}
|
|
${CMAKE_SOURCE_DIR}/3rdparty/monocypher
|
|
)
|
|
|
|
# nlohmann/json, wherever this machine keeps it: the ANSLibs tree on Windows,
|
|
# vcpkg, or the system elsewhere. Asked for by name rather than assumed — the
|
|
# Windows branch used to point at vcpkg alone, and on a real build machine the
|
|
# header lives under ANSLibs, so every target that linked this one failed to
|
|
# find it while the engines, which add ANSLibs themselves, compiled fine.
|
|
find_path(ANSCORE_NLOHMANN_INCLUDE nlohmann/json.hpp
|
|
HINTS ${ANSLIBS_DIR} ${VCPKG_INCLUDE_DIR}
|
|
/opt/homebrew/include /usr/local/include /usr/include)
|
|
if(ANSCORE_NLOHMANN_INCLUDE)
|
|
target_include_directories(ANSModelPackage PUBLIC ${ANSCORE_NLOHMANN_INCLUDE})
|
|
message(STATUS "ANSModelPackage: nlohmann/json at ${ANSCORE_NLOHMANN_INCLUDE}")
|
|
else()
|
|
message(WARNING "nlohmann/json.hpp not found — ANSModelPackage will not build")
|
|
endif()
|
|
|
|
# The model-package key, decided at configure time: see ANSModelKeys.h for why
|
|
# this is not an __has_include test. PUBLIC so every engine that opens a
|
|
# package is compiled with the same answer.
|
|
if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/ANSModelKeysGenerated.h")
|
|
target_compile_definitions(ANSModelPackage PUBLIC ANSCORE_HAVE_BUILTIN_MODEL_KEYS=1)
|
|
message(STATUS "ANSModelPackage: key present — packages can be opened")
|
|
else()
|
|
message(STATUS "ANSModelPackage: no key — packages cannot be opened "
|
|
"(run ansmodel-keys emit --product anscore, then re-run cmake)")
|
|
endif()
|
|
|
|
set_target_properties(ANSModelPackage PROPERTIES POSITION_INDEPENDENT_CODE ON)
|