--- cmake/modules/FindMySQLAmarok.cmake~ 2015-06-11 05:24:42.000000000 +0000 +++ cmake/modules/FindMySQLAmarok.cmake 2015-12-02 20:47:45.710063206 +0000 @@ -25,15 +25,17 @@ set(MYSQL_EMBEDDED_CFLAGS ${MYSQL_CFLAGS}) - if(MYSQL_EMBEDDED_LIBSTEMP) + if(NOT _return_VALUE) set( HAVE_MYSQL_EMBEDDED true ) - endif(MYSQL_EMBEDDED_LIBSTEMP) + endif(NOT _return_VALUE) find_library(MYSQLD_PIC_SEPARATE mysqld_pic PATH_SUFFIXES mysql ) + if(HAVE_MYSQL_EMBEDDED) + if(MYSQLD_PIC_SEPARATE) string(REPLACE "lmysqld" "lmysqld_pic" MYSQL_EMBEDDED_LIBRARIES ${MYSQL_EMBEDDED_LIBSTEMP}) # append link directory to variable as mysql_config is not always (since Ubuntu 12.04?) @@ -51,6 +53,8 @@ set(MYSQL_EMBEDDED_LIBRARIES "${MYSQL_EMBEDDED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}") endif(UNIX) + endif(HAVE_MYSQL_EMBEDDED) + else(MYSQLCONFIG_EXECUTABLE) if(WIN32)