mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-28 16:43:58 +00:00
d35077ae8b
- use CMake. I just didn't got it to work with SCons. - patch cmake to find harfbuzz - prefetch catch2 for enabling tests - add erictapen as maintainer - build mapnik-config with scons, as it isn't build by cmake - use python3 exclusively - build with harfbuzz-icu - change license to lgpl21Plus - use PROJ 8 - use latest scons, but use cmake for everything but mapnik-config - don't make postgresql optional Co-Authored-by: Robert Schütz <nix@dotlambda.de>
15 lines
418 B
Diff
15 lines
418 B
Diff
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
|
index 0705ddce1..771291b88 100644
|
|
--- a/test/CMakeLists.txt
|
|
+++ b/test/CMakeLists.txt
|
|
@@ -7,8 +7,7 @@ include(FetchContent)
|
|
|
|
FetchContent_Declare(
|
|
Catch2
|
|
- GIT_REPOSITORY https://github.com/catchorg/Catch2.git
|
|
- GIT_TAG v2.13.7)
|
|
+ SOURCE_DIR @catch2_src@)
|
|
FetchContent_MakeAvailable(Catch2)
|
|
|
|
if(${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.19.0")
|