[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok] c71e00e: Add threads library the list of MYSQL_EMBEDDED_LIB
From:       Modestas Vainius <modestas () vainius ! eu>
Date:       2010-07-13 23:16:32
Message-ID: 20100713231632.911F6C185CC () projects ! kde ! org
[Download RAW message or body]

commit c71e00edfc814104f0b465781038e81a06b50d99
Author: Modestas Vainius <modestas@vainius.eu>
Date:   Wed Jul 14 02:13:16 2010 +0300

    Add threads library the list of MYSQL_EMBEDDED_LIBRARIES on unix.
    
    On Linux (at least), libmysqld wants -lpthread, but it is very likely that it
    does not say that explicitly in --libmysqld-libs. So add it manually.

diff --git a/cmake/modules/FindMySQLAmarok.cmake b/cmake/modules/FindMySQLAmarok.cmake
index 54cf925..a575c0b 100644
--- a/cmake/modules/FindMySQLAmarok.cmake
+++ b/cmake/modules/FindMySQLAmarok.cmake
@@ -41,6 +41,13 @@ if(MYSQLCONFIG_EXECUTABLE)
         set(MYSQL_EMBEDDED_LIBRARIES ${MYSQL_EMBEDDED_LIBSTEMP})
     endif(MYSQLD_PIC_SEPARATE)
 
+    if (UNIX)
+        # libmysqld wants -lpthread, but it is very likely it does not say that
+        # explicitly in --libmysqld-libs
+        find_package(Threads)
+        set(MYSQL_EMBEDDED_LIBRARIES "${MYSQL_EMBEDDED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}")
+    endif(UNIX)
+
 else(MYSQLCONFIG_EXECUTABLE)
 
     find_path(MYSQL_INCLUDE_DIR mysql.h
[prev in list] [next in list] [prev in thread] [next in thread]