Attach Boost and SYSTEM def to Nix target instead of plugin

dblsaiko
Nov 27, 2023, 10:45 PM
SGQQ6LNZCGWM4WP5VOOCGDUZ2FVQEC4FANXJ5SEZPDQHSLF7YL2QC

Dependencies

  • [2] 7YS2X7JJ Fix compilation against older Nix versions (tested with 2.13.6)
  • [3] 3KEFKH5F Import existing code

Change contents

  • replacement in CMakeLists.txt at line 31
    [2.562][2.562:677]()
    "NIX_VERSION=(((0x${Nix_MAJOR_VERSION})<<16) | ((0x${Nix_MINOR_VERSION})<<8) | (0x${Nix_PATCH_VERSION}))")
    [2.562]
    [2.677]
    "NIX_VERSION=(((0x${Nix_MAJOR_VERSION})<<16) | ((0x${Nix_MINOR_VERSION})<<8) | (0x${Nix_PATCH_VERSION}))"
    SYSTEM="")
    target_link_libraries(PkgConfig::Nix
    INTERFACE
    Boost::headers)
  • replacement in src/CMakeLists.txt at line 9
    [3.13098][3.13098:13180]()
    target_link_libraries(pijul PUBLIC
    PkgConfig::Nix
    Boost::headers)
    [3.13098]
    [3.13180]
    target_link_libraries(pijul
    PUBLIC
    PkgConfig::Nix)
  • edit in src/CMakeLists.txt at line 13
    [3.13181][3.13181:13234]()
    target_compile_definitions(pijul PRIVATE SYSTEM="")