From bfaed2bec69830b1defc48ea069cdc2a74aee9ba Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Mon, 17 Sep 2012 13:15:05 +0200 Subject: [PATCH] core: move the set of cmake policy CMP0003 in directory src (so it applies to all plugins) (bug #37311) --- ChangeLog | 2 ++ src/CMakeLists.txt | 3 +++ src/gui/curses/CMakeLists.txt | 4 ---- src/gui/gtk/CMakeLists.txt | 4 ---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3f559ee21..c958a2ec9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ v0.3.9-rc1, 2012-09-17 Version 0.3.9 (under dev!) -------------------------- +* core: move the set of cmake policy CMP0003 in directory src (so it applies to + all plugins) (bug #37311) * core: add signals for plugins loaded/unloaded * core: add default key alt+"x" (zoom on merged buffer) (task #11029) * core: fix display bug when end of a line is displayed on top of chat (last diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 979f46ad0..1534ab408 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,6 +20,9 @@ # if(COMMAND cmake_policy) + if(POLICY CMP0003) + cmake_policy(SET CMP0003 NEW) + endif(POLICY CMP0003) if(POLICY CMP0017) cmake_policy(SET CMP0017 NEW) endif(POLICY CMP0017) diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index f33c31d92..01e3be837 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -19,10 +19,6 @@ # along with WeeChat. If not, see . # -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - SET(WEECHAT_CURSES_SRC gui-curses.h gui-curses-bar-window.c diff --git a/src/gui/gtk/CMakeLists.txt b/src/gui/gtk/CMakeLists.txt index 2d5dcabf0..d9ef4fd2b 100644 --- a/src/gui/gtk/CMakeLists.txt +++ b/src/gui/gtk/CMakeLists.txt @@ -18,10 +18,6 @@ # along with WeeChat. If not, see . # -if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 NEW) -endif(COMMAND cmake_policy) - SET(WEECHAT_GTK_SRC gui-gtk.h gui-gtk-bar-window.c