diff --git a/CMakeLists.txt b/CMakeLists.txt index 8316b2339..0aecf7376 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -242,8 +242,6 @@ endif() # Check for CURL find_package(CURL REQUIRED) -set(STATIC_LIBS weechat_plugins) - find_library(DL_LIBRARY NAMES dl PATHS /lib /usr/lib /usr/libexec /usr/local/lib /usr/local/libexec diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 88a4de042..b549ef2be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -20,7 +20,6 @@ # add_subdirectory(core) -list(APPEND STATIC_LIBS weechat_core) add_subdirectory(plugins) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 6ccbc254b..3ff0c7736 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -45,6 +45,5 @@ set(LIB_GUI_COMMON_SRC include_directories("${CMAKE_BINARY_DIR}") add_library(weechat_gui_common OBJECT ${LIB_GUI_COMMON_SRC}) target_link_libraries(weechat_gui_common coverage_config) -list(APPEND STATIC_LIBS weechat_gui_common) subdirs(curses) diff --git a/src/gui/curses/headless/CMakeLists.txt b/src/gui/curses/headless/CMakeLists.txt index 6f65ccbfd..6a8367547 100644 --- a/src/gui/curses/headless/CMakeLists.txt +++ b/src/gui/curses/headless/CMakeLists.txt @@ -56,10 +56,12 @@ add_dependencies(${EXECUTABLE} ) target_link_libraries(${EXECUTABLE} + weechat_core + weechat_plugins + weechat_gui_common weechat_gui_headless weechat_ncurses_fake ${EXTRA_LIBS} - ${STATIC_LIBS} coverage_config ) diff --git a/src/gui/curses/normal/CMakeLists.txt b/src/gui/curses/normal/CMakeLists.txt index 3fa7436b0..1716905a8 100644 --- a/src/gui/curses/normal/CMakeLists.txt +++ b/src/gui/curses/normal/CMakeLists.txt @@ -59,9 +59,11 @@ add_dependencies(${EXECUTABLE} weechat_gui_curses_normal) list(APPEND EXTRA_LIBS ${NCURSES_LIBRARY}) target_link_libraries(${EXECUTABLE} + weechat_core + weechat_plugins + weechat_gui_common weechat_gui_curses_normal ${EXTRA_LIBS} - ${STATIC_LIBS} coverage_config )