diff options
| author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-11-16 09:34:27 +0100 |
|---|---|---|
| committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-11-16 09:34:27 +0100 |
| commit | 154d97abdd16674fdebc763351f661bbcdc869a4 (patch) | |
| tree | 0277a9380edd1390f16e432283d32499ffed36d1 /gnu/packages/image-processing.scm | |
| parent | e4696c69d75f4fcf54c42beeb928032726bdaf7d (diff) | |
| parent | 87e7faa2ae641d8302efc8b90f1e45f43f67f6da (diff) | |
| download | guix-154d97abdd16674fdebc763351f661bbcdc869a4.tar.gz | |
Merge remote-tracking branch master into core-updates
Diffstat (limited to 'gnu/packages/image-processing.scm')
| -rw-r--r-- | gnu/packages/image-processing.scm | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index 460f35dbae..2579da3d6a 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm @@ -269,10 +269,6 @@ integrates with various databases on GUI toolkits such as Qt and Tk.") "-DWITH_CAROTENE=OFF" ; only visible on arm/aarch64 "-DENABLE_PRECOMPILED_HEADERS=OFF" - ;; FIXME: OpenEXR requires C++11 or later. Remove this when - ;; the default compiler is GCC 7. - "-DCMAKE_CXX_FLAGS=-std=gnu++11" - ;; CPU-Features: ;; See cmake/OpenCVCompilerOptimizations.cmake ;; (CPU_ALL_OPTIMIZATIONS) for a list of all optimizations @@ -729,8 +725,7 @@ combine the information contained in both.") "-DSNAP_VERSION_GIT_BRANCH=release" "-DSNAP_VERSION_GIT_TIMESTAMP=0" "-DSNAP_PACKAGE_QT_PLUGINS=OFF" - "-DCMAKE_POSITION_INDEPENDENT_CODE=ON" - "-DCMAKE_CXX_FLAGS=-std=gnu++11 -fpermissive") + "-DCMAKE_POSITION_INDEPENDENT_CODE=ON") #:phases (modify-phases %standard-phases ;; During the installation phase all libraries provided by all |