From 5b79c0247f5fa3eb22c1e8e95c6aadbd3792960e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 15 Apr 2014 20:21:10 +0200 Subject: [PATCH] Change option name and generated header names. --- cmake/Modules/UseWarnings.cmake | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cmake/Modules/UseWarnings.cmake b/cmake/Modules/UseWarnings.cmake index bb92657b4..c4cab18d8 100644 --- a/cmake/Modules/UseWarnings.cmake +++ b/cmake/Modules/UseWarnings.cmake @@ -14,8 +14,8 @@ if (CXX_COMPAT_GCC) endif () option(SILENCE_DUNE_WARNINGS "Disable warnings from DUNE?" OFF) -if(SILENCE_DUNE_WARNINGS AND CXX_COMPAT_GCC) - file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h " +if(SILENCE_EXTERNAL_WARNINGS AND CXX_COMPAT_GCC) + file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h " #pragma GCC diagnostic push #pragma GCC diagnostic ignored \"-Wdeprecated-declarations\" #pragma GCC diagnostic ignored \"-Wdeprecated-register\" @@ -24,8 +24,8 @@ if(SILENCE_DUNE_WARNINGS AND CXX_COMPAT_GCC) #pragma GCC diagnostic ignored \"-Wshadow\" #pragma GCC diagnostic ignored \"-Wsign-compare\" #pragma GCC diagnostic ignored \"-Wunused-parameter\"") - file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "#pragma GCC diagnostic pop") + file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "#pragma GCC diagnostic pop") else() - file(WRITE ${CMAKE_BINARY_DIR}/dune_disable_pragmas.h "") - file(WRITE ${CMAKE_BINARY_DIR}/dune_reenable_pragmas.h "") + file(WRITE ${CMAKE_BINARY_DIR}/disable_warning_pragmas.h "") + file(WRITE ${CMAKE_BINARY_DIR}/reenable_warning_pragmas.h "") endif()