From 468422e130aadd7c77d06c11d01ecee657593f8a Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Fri, 7 Mar 2008 17:22:32 +0100 Subject: [PATCH] Fix of link with cmake for Curses and Gtk executables --- src/gui/curses/CMakeLists.txt | 19 +++---------------- src/gui/gtk/CMakeLists.txt | 19 +++---------------- 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/src/gui/curses/CMakeLists.txt b/src/gui/curses/CMakeLists.txt index 8a30cc68d..09d731795 100644 --- a/src/gui/curses/CMakeLists.txt +++ b/src/gui/curses/CMakeLists.txt @@ -39,22 +39,9 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") LIST(APPEND EXTRA_LIBS "utf8") ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD") -ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_CURSES_SRC} -../../core/weechat.o -../../core/wee-backtrace.o -../../core/wee-command.o -../../core/wee-config.o -../../core/wee-config-file.o -../../core/wee-debug.o -../../core/wee-hook.o -../../core/wee-input.o -../../core/wee-list.o -../../core/wee-log.o -../../core/wee-upgrade.o -../../core/wee-string.o -../../core/wee-utf8.o -../../core/wee-util.o) +ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_CURSES_SRC}) + INCLUDE_DIRECTORIES(.. ../../core ../../plugins) -TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS}) +TARGET_LINK_LIBRARIES(${EXECUTABLE} -lweechat_core ${STATIC_LIBS} ${EXTRA_LIBS}) INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin) diff --git a/src/gui/gtk/CMakeLists.txt b/src/gui/gtk/CMakeLists.txt index ab2358573..ca7ae90bb 100644 --- a/src/gui/gtk/CMakeLists.txt +++ b/src/gui/gtk/CMakeLists.txt @@ -31,22 +31,9 @@ IF(PKG_CONFIG_FOUND) ENDIF(GTK2_FOUND) ENDIF(PKG_CONFIG_FOUND) -ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_GTK_SRC} -../../core/weechat.o -../../core/wee-backtrace.o -../../core/wee-command.o -../../core/wee-config.o -../../core/wee-config-file.o -../../core/wee-debug.o -../../core/wee-hook.o -../../core/wee-input.o -../../core/wee-list.o -../../core/wee-log.o -../../core/wee-upgrade.o -../../core/wee-string.o -../../core/wee-utf8.o -../../core/wee-util.o) +ADD_EXECUTABLE(${EXECUTABLE} ${WEECHAT_GTK_SRC}) + INCLUDE_DIRECTORIES(.. ../../core ../../plugins) -TARGET_LINK_LIBRARIES(${EXECUTABLE} ${STATIC_LIBS} ${EXTRA_LIBS}) +TARGET_LINK_LIBRARIES(${EXECUTABLE} -lweechat_core ${STATIC_LIBS} ${EXTRA_LIBS}) INSTALL(TARGETS ${EXECUTABLE} RUNTIME DESTINATION bin)