diff options
| author | nyanloutre <paul@nyanlout.re> | 2019-08-22 14:03:49 +0200 |
|---|---|---|
| committer | nyanloutre <paul@nyanlout.re> | 2019-08-22 14:03:49 +0200 |
| commit | 9f5f9ab7e97b068c23eb66621a16c0f69740c90e (patch) | |
| tree | c2fbfac854956640835fc6cf8a77b0848d4bb4d7 /pkgs/development/libraries/grantlee | |
| parent | e841edacc5dc50cdf004c9e2cbf934bc978bdedb (diff) | |
| download | nixpkgs-9f5f9ab7e97b068c23eb66621a16c0f69740c90e.tar nixpkgs-9f5f9ab7e97b068c23eb66621a16c0f69740c90e.tar.gz nixpkgs-9f5f9ab7e97b068c23eb66621a16c0f69740c90e.tar.bz2 nixpkgs-9f5f9ab7e97b068c23eb66621a16c0f69740c90e.tar.lz nixpkgs-9f5f9ab7e97b068c23eb66621a16c0f69740c90e.tar.xz nixpkgs-9f5f9ab7e97b068c23eb66621a16c0f69740c90e.tar.zst nixpkgs-9f5f9ab7e97b068c23eb66621a16c0f69740c90e.zip | |
grantlee5: fix build with recent CMake versions
Diffstat (limited to 'pkgs/development/libraries/grantlee')
| -rw-r--r-- | pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch | 24 | ||||
| -rw-r--r-- | pkgs/development/libraries/grantlee/5/series | 1 |
2 files changed, 25 insertions, 0 deletions
diff --git a/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch new file mode 100644 index 00000000000..d049d6c96f8 --- /dev/null +++ b/pkgs/development/libraries/grantlee/5/grantlee-cxx11.patch @@ -0,0 +1,24 @@ +From 3a5fc7662da3261be6496611900c095844e56ab1 Mon Sep 17 00:00:00 2001 +From: Albert Astals Cid <aacid@kde.org> +Date: Sat, 20 Jul 2019 17:35:30 +0200 +Subject: [PATCH] Fix compile with newer Qt/cmake combination + +Without this i get huge errors about Qt needing C++11 support +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6d51110..0859788 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -11,6 +11,9 @@ endif() + + project(Grantlee) + ++set (CMAKE_CXX_STANDARD 11) ++set (CMAKE_CXX_EXTENSIONS OFF) ++ + # Workaround for http://public.kitware.com/Bug/view.php?id=12301 + if (MINGW) + if(NOT CMAKE_BUILD_TYPE) diff --git a/pkgs/development/libraries/grantlee/5/series b/pkgs/development/libraries/grantlee/5/series index 9c4015a1c19..19850b2e7e4 100644 --- a/pkgs/development/libraries/grantlee/5/series +++ b/pkgs/development/libraries/grantlee/5/series @@ -1,2 +1,3 @@ grantlee-nix-profiles.patch grantlee-no-canonicalize-filepath.patch +grantlee-cxx11.patch |