Unverified Commit ac80080a authored by Vladimír Čunát's avatar Vladimír Čunát Committed by GitHub
Browse files

antlr4_{9,10,11}.runtime.cpp: fix build (#451891)

parents 02f6142d 8ee65f82

pkgs/development/tools/parsing/antlr/4.10.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 302cd4a78..336a37bf0 100644

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

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

@@ -30,15 +30,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.11.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 df621b11d..c20b92170 100644

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

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

@@ -39,15 +39,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(APPLE)

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

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

        (lib.cmakeBool "ANTLR_BUILD_CPP_TESTS" false)

      ];

      extraPatches = [

        ./4.11.runtime.cpp.cmake.patch

      ];

    }).antlr;



  antlr4_10 =
@@ -184,6 +187,9 @@ in 
        (lib.cmakeBool "ANTLR4_INSTALL" true)

        (lib.cmakeBool "ANTLR_BUILD_CPP_TESTS" false)

      ];

      extraPatches = [

        ./4.10.runtime.cpp.cmake.patch

      ];

    }).antlr;



  antlr4_9 =
@@ -194,9 +200,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;