mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing compilation failure on Windows.

Browse source 
"PCRE_STATIC" must be defined before including pcre.h
to avoid linking errors:
- unresolved external symbol __imp_regerror
- unresolved external symbol __imp_pcre_exec
This commit is contained in:
Alexander Barkov 2013-09-27 16:29:05 +04:00
parent 90b8fee692
commit 7fe391adbf
3 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
client/CMakeLists.txt
View file

@ -36,8 +36,7 @@ ENDIF(UNIX)
MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre)
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcreposix)
TARGET_LINK_LIBRARIES(mysqltest mysqlclient pcre pcreposix)
SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)

1
client/mysqltest.cc
View file

@ -44,6 +44,7 @@
#include <hash.h>
#include <stdarg.h>
#include <violite.h>
#define PCRE_STATIC 1 /* Important on Windows */
#include <pcreposix.h> /* pcreposix regex library */
#ifdef HAVE_SYS_WAIT_H
#include <sys/wait.h>

1
sql/item_cmpfunc.h
View file

@ -25,6 +25,7 @@
#include "thr_malloc.h" /* sql_calloc */
#include "item_func.h" /* Item_int_func, Item_bool_func */
#define PCRE_STATIC 1 /* Important on Windows */
#include <pcre.h> /* pcre header file */
extern Item_result item_cmp_type(Item_result a,Item_result b);