|
Lines 25-39
Link Here
|
| 25 |
|
25 |
|
| 26 |
set(MYSQL_EMBEDDED_CFLAGS ${MYSQL_CFLAGS}) |
26 |
set(MYSQL_EMBEDDED_CFLAGS ${MYSQL_CFLAGS}) |
| 27 |
|
27 |
|
| 28 |
if(MYSQL_EMBEDDED_LIBSTEMP) |
28 |
if(NOT _return_VALUE) |
| 29 |
set( HAVE_MYSQL_EMBEDDED true ) |
29 |
set( HAVE_MYSQL_EMBEDDED true ) |
| 30 |
endif(MYSQL_EMBEDDED_LIBSTEMP) |
30 |
endif(NOT _return_VALUE) |
| 31 |
|
31 |
|
| 32 |
find_library(MYSQLD_PIC_SEPARATE |
32 |
find_library(MYSQLD_PIC_SEPARATE |
| 33 |
mysqld_pic |
33 |
mysqld_pic |
| 34 |
PATH_SUFFIXES mysql |
34 |
PATH_SUFFIXES mysql |
| 35 |
) |
35 |
) |
| 36 |
|
36 |
|
|
|
37 |
if(HAVE_MYSQL_EMBEDDED) |
| 38 |
|
| 37 |
if(MYSQLD_PIC_SEPARATE) |
39 |
if(MYSQLD_PIC_SEPARATE) |
| 38 |
string(REPLACE "lmysqld" "lmysqld_pic" MYSQL_EMBEDDED_LIBRARIES ${MYSQL_EMBEDDED_LIBSTEMP}) |
40 |
string(REPLACE "lmysqld" "lmysqld_pic" MYSQL_EMBEDDED_LIBRARIES ${MYSQL_EMBEDDED_LIBSTEMP}) |
| 39 |
# append link directory to variable as mysql_config is not always (since Ubuntu 12.04?) |
41 |
# append link directory to variable as mysql_config is not always (since Ubuntu 12.04?) |
|
Lines 51-56
Link Here
|
| 51 |
set(MYSQL_EMBEDDED_LIBRARIES "${MYSQL_EMBEDDED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}") |
53 |
set(MYSQL_EMBEDDED_LIBRARIES "${MYSQL_EMBEDDED_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT}") |
| 52 |
endif(UNIX) |
54 |
endif(UNIX) |
| 53 |
|
55 |
|
|
|
56 |
endif(HAVE_MYSQL_EMBEDDED) |
| 57 |
|
| 54 |
else(MYSQLCONFIG_EXECUTABLE) |
58 |
else(MYSQLCONFIG_EXECUTABLE) |
| 55 |
|
59 |
|
| 56 |
if(WIN32) |
60 |
if(WIN32) |
