1
0
mirror of https://github.com/weechat/weechat.git synced 2026-06-28 13:56:37 +02:00

Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/weechat

This commit is contained in:
Sebastien Helleu
2012-01-16 19:20:02 +01:00
3 changed files with 16 additions and 1 deletions
+2 -1
View File
@@ -1,12 +1,13 @@
WeeChat ChangeLog
=================
Sébastien Helleu <flashcode@flashtux.org>
v0.3.7-dev, 2012-01-06
v0.3.7-dev, 2012-01-16
Version 0.3.7 (under dev!)
--------------------------
* core: add library "pthread" in cmake file for link on OpenBSD
* core: use extended regex in filters (patch #7616)
* core: save current mouse state in option weechat.look.mouse (set option when
mouse state is changed with command /mouse)
+4
View File
@@ -57,6 +57,10 @@ IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
ENDIF(HAVE_BACKTRACE)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
LIST(APPEND EXTRA_LIBS "pthread")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
IF(ICONV_LIBRARY)
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
ENDIF(ICONV_LIBRARY)
+10
View File
@@ -46,6 +46,16 @@ IF(PKG_CONFIG_FOUND)
ENDIF(GTK2_FOUND)
ENDIF(PKG_CONFIG_FOUND)
IF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
IF(HAVE_BACKTRACE)
LIST(APPEND EXTRA_LIBS "execinfo")
ENDIF(HAVE_BACKTRACE)
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
IF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
LIST(APPEND EXTRA_LIBS "pthread")
ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
IF(ICONV_LIBRARY)
LIST(APPEND EXTRA_LIBS ${ICONV_LIBRARY})
ENDIF(ICONV_LIBRARY)