diff --git a/core/ANSModelPackage/CMakeLists.txt b/core/ANSModelPackage/CMakeLists.txt index 8451ae0..0aaac8f 100644 --- a/core/ANSModelPackage/CMakeLists.txt +++ b/core/ANSModelPackage/CMakeLists.txt @@ -14,18 +14,19 @@ target_include_directories(ANSModelPackage PUBLIC ${CMAKE_SOURCE_DIR}/3rdparty/monocypher ) -# nlohmann/json comes from vcpkg on Windows and the system elsewhere, the same -# way ANSFR already takes it. -if(WIN32) - target_include_directories(ANSModelPackage PUBLIC ${VCPKG_INCLUDE_DIR}) +# 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() - find_path(ANSCORE_NLOHMANN_INCLUDE nlohmann/json.hpp - HINTS /opt/homebrew/include /usr/local/include /usr/include) - if(ANSCORE_NLOHMANN_INCLUDE) - target_include_directories(ANSModelPackage PUBLIC ${ANSCORE_NLOHMANN_INCLUDE}) - else() - message(WARNING "nlohmann/json.hpp not found — ANSModelPackage will not build") - endif() + 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