mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-26 07:34:11 +00:00
7b5ee6d927
3.9.1 is problematic atm because it'll unconditionally use the libxml2 externalproject on linux: https://github.com/adobe-type-tools/afdko/pull/1527#issuecomment-1172872618 https://github.com/adobe-type-tools/afdko/blob/3.9.0/NEWS.md#390-released-2022-06-23
23 lines
773 B
Diff
23 lines
773 B
Diff
commit c423d1ddf0345aed7ecaf4c8b9e1fa5108aafc6f
|
|
Author: sternenseemann <sternenseemann@systemli.org>
|
|
Date: Sat Jul 2 12:35:56 2022 +0200
|
|
|
|
Force use of CMake-shipped FindLibXml2 module
|
|
|
|
This is needed to work around a nixpkgs bug:
|
|
https://github.com/NixOS/nixpkgs/issues/125008
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index a75b6fb1..c1408283 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -42,7 +42,7 @@ set(ANTLR4_TAG tags/4.9.3)
|
|
find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime)
|
|
set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER})
|
|
|
|
-FIND_PACKAGE(LibXml2)
|
|
+FIND_PACKAGE(LibXml2 REQUIRED MODULE)
|
|
IF (NOT ${LibXml2_FOUND})
|
|
MESSAGE(STATUS "Could not locate LibXml2, will install externally.")
|
|
set(LIBXML2_TAG tags/v2.9.13)
|