From a1b4c4c1442d87fc1b464061544c919f4e32c1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ole-Andr=C3=A9=20Rodlie?= Date: Fri, 8 Dec 2023 22:47:18 +0100 Subject: [PATCH] Update friction-common.cmake --- src/cmake/friction-common.cmake | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/cmake/friction-common.cmake b/src/cmake/friction-common.cmake index e91a0654d..d71485587 100644 --- a/src/cmake/friction-common.cmake +++ b/src/cmake/friction-common.cmake @@ -25,8 +25,14 @@ set(CMAKE_AUTORCC ON) set(CMAKE_CXX_STANDARD 14) set(CMAKE_CXX_STANDARD_REQUIRED ON) +option(LINUX_DEPLOY "Linux Deploy" OFF) +option(WIN_DEPLOY "Windows Deploy" OFF) + if(UNIX) - add_compile_options(-Wall -Wextra -Wno-unused-private-field -Wno-deprecated-copy-with-user-provided-copy) + add_compile_options(-Wall -Wextra -Wno-unused-private-field) + if(NOT ${LINUX_DEPLOY}) + add_compile_options(-Wno-deprecated-copy-with-user-provided-copy) + endif() if(APPLE) add_compile_options(-frtti) endif() @@ -42,9 +48,6 @@ if(MSVC) add_definitions("/MP") endif() -option(LINUX_DEPLOY "Linux Deploy" OFF) -option(WIN_DEPLOY "Windows Deploy" OFF) - if(UNIX AND NOT APPLE) option(STATIC_FFMPEG "Link against static ffmpeg" OFF) if(${STATIC_FFMPEG})