From 1f787ddcbaf7ebcdc90994fb8413f6afdd98b456 Mon Sep 17 00:00:00 2001 From: Julien Louis Date: Fri, 4 Jul 2008 17:31:22 +0200 Subject: [PATCH] Fix some warnings with cmake 2.6 Signed-off-by: Julien Louis --- CMakeLists.txt | 2 ++ src/CMakeLists.txt | 6 +++++- src/gui/curses/CMakeLists.txt | 6 +++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 83b332e67..72eb44a9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,6 +16,8 @@ PROJECT(weechat) +cmake_minimum_required(VERSION 2.4) + SET(CMAKE_VERBOSE_MAKEFILE OFF) SET(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) SET(CMAKE_SKIP_RPATH ON) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bf6584a10..7f93b16f4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -100,7 +100,11 @@ IF(DL_LIBRARY) LIST(APPEND EXTRA_LIBS dl) ENDIF(DL_LIBRARY) -ADD_DEFINITIONS(-DWEECHAT_VERSION='"${VERSION}"') +if(COMMAND cmake_policy) + cmake_policy(SET CMP0005 NEW) +endif(COMMAND cmake_policy) + +ADD_DEFINITIONS(-DWEECHAT_VERSION="${VERSION}") ADD_SUBDIRECTORY( core ) LIST(APPEND STATIC_LIBS weechat_core) diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index 0f8794596..7be285854 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -14,6 +14,10 @@ # along with this program. If not, see . # +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) + SET(WEECHAT_CURSES_SRC gui-curses-bar.c gui-curses-chat.c gui-curses-color.c gui-curses-input.c gui-curses-keyboard.c gui-curses-main.c gui-curses-nicklist.c gui-curses-status.c gui-curses-window.c gui-curses.h) @@ -44,6 +48,6 @@ ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_CURSES_SRC}) INCLUDE_DIRECTORIES(.. ../../core ../../plugins) # Because of a linker bug, we have to link 2 times with libweechat_core.a -TARGET_LINK_LIBRARIES(${EXECUTABLE} -lweechat_core ${STATIC_LIBS} ${EXTRA_LIBS}) +TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS}) INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)