Unverified Commit 50433c5c authored by Aaron Jheng's avatar Aaron Jheng
Browse files

antlr4_9.runtime.cpp: fix build

parent 6fd49fba

pkgs/development/tools/parsing/antlr/4.9.runtime.cpp.cmake.patch

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

index e549f113f..c84f591c2 100644

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

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

@@ -28,15 +28,10 @@ project(LIBANTLR4)

 if(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR

    CMAKE_VERSION VERSION_GREATER "3.0.0")

   CMAKE_POLICY(SET CMP0026 NEW)

-  CMAKE_POLICY(SET CMP0054 OLD)

-  CMAKE_POLICY(SET CMP0045 OLD)

-  CMAKE_POLICY(SET CMP0042 OLD)

 endif()

 

 if(CMAKE_VERSION VERSION_EQUAL "3.3.0" OR

    CMAKE_VERSION VERSION_GREATER "3.3.0")

-  CMAKE_POLICY(SET CMP0059 OLD)

-  CMAKE_POLICY(SET CMP0054 OLD)

 endif()

 

 if(CMAKE_SYSTEM_NAME MATCHES "Linux")

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

+2 −0
Original line number Diff line number Diff line
@@ -194,9 +194,11 @@ in 
      extraCppBuildInputs = [ utf8cpp ] ++ lib.optional stdenv.hostPlatform.isLinux libuuid;

      extraCppCmakeFlags = [

        (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-I${lib.getDev utf8cpp}/include/utf8cpp")

        (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")

      ];

      extraPatches = [

        ./utf8cpp.patch

        ./4.9.runtime.cpp.cmake.patch

      ];

    }).antlr;