Commit 486f01cd authored by Henner Zeller's avatar Henner Zeller
Browse files

antlr4_13: add patch to fix libantlrcpp_INCLUDE_INSTALL_DIR 

Fixes #379757
parent cdc1e344

pkgs/development/tools/parsing/antlr/4.nix

+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@ in { 
      # not available in a sandboxed build.

      "-DANTLR_BUILD_CPP_TESTS=OFF"

    ];

    extraPatches = [

      ./include-dir-issue-379757.patch

    ];

  }).antlr;



  antlr4_12 = (mkAntlr {

pkgs/development/tools/parsing/antlr/include-dir-issue-379757.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git a/runtime/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt

index be0d8bf03..09f825642 100644

--- a/runtime/Cpp/runtime/CMakeLists.txt

+++ b/runtime/Cpp/runtime/CMakeLists.txt

@@ -7,7 +7,7 @@ if (NOT ANTLR_BUILD_SHARED AND NOT ANTLR_BUILD_STATIC)

   message(FATAL_ERROR "Options ANTLR_BUILD_SHARED and ANTLR_BUILD_STATIC can't both be OFF")

 endif()

 

-set(libantlrcpp_INCLUDE_INSTALL_DIR "include/antlr4-runtime")

+set(libantlrcpp_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/antlr4-runtime")

 

 set(libantlrcpp_INCLUDE_DIRS

   ${PROJECT_SOURCE_DIR}/runtime/src