From f0fca253c24af2b8e9d12a1adf2ae2ee871377c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= <zebob.m@gmail.com>
Date: Tue, 26 Mar 2019 16:57:19 +0100
Subject: [PATCH] Work around ppc64le build failure with GNU C++ and -std=c++
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: Robert-André Mauchin <zebob.m@gmail.com>
---
CMakeLists.txt | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a04883..60c51b4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,7 +236,11 @@ add_dependencies(w2xc gensrcs)
if(CMAKE_COMPILER_IS_GNUCXX OR ${CMAKE_CXX_COMPILER_ID} MATCHES "^(Apple)?Clang$")
set(CMAKE_CXX_STANDARD 17)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ if(CMAKE_COMPILER_IS_GNUCXX)
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++17")
+ else()
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+ endif()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
if (${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
@@ -372,7 +376,7 @@ if(WIN32)
else()
option(INSTALL_MODELS "Install waifu2x RGB models" true)
endif()
-
+
if(INSTALL_MODELS)
add_definitions(-DDEFAULT_MODELS_DIRECTORY="${CMAKE_INSTALL_PREFIX}/share/waifu2x-converter-cpp")
install(DIRECTORY models_rgb/ DESTINATION share/waifu2x-converter-cpp)
--
2.20.1