Commit 118501a0 authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

#4096 add version string to portability lib name refs[t:4096]

git-svn-id: file:///svn/mysql/tokudb-engine/tokudb-engine@38430 c7de825b-a66e-492c-adef-691d508d4ae1
parent 6c3771ff
SET(TOKUDB_VERSION $ENV{TOKUDB_VERSION}) SET(TOKUDB_VERSION $ENV{TOKUDB_VERSION})
SET(TOKUFRACTALTREE_RELEASE_DIR $ENV{TOKUFRACTALTREE}) SET(TOKUFRACTALTREE_RELEASE_DIR $ENV{TOKUFRACTALTREE})
SET(TOKUFRACTALTREE_LIBNAME $ENV{TOKUFRACTALTREE_LIBNAME}) SET(TOKUFRACTALTREE_LIBNAME $ENV{TOKUFRACTALTREE_LIBNAME})
SET(TOKUPORTABILITY_LIBNAME $ENV{TOKUPORTABILITY_LIBNAME})
ADD_DEFINITIONS("-DTOKUDB_VERSION=\"${TOKUDB_VERSION}\"") ADD_DEFINITIONS("-DTOKUDB_VERSION=\"${TOKUDB_VERSION}\"")
INCLUDE_DIRECTORIES(${TOKUFRACTALTREE_RELEASE_DIR}/include) INCLUDE_DIRECTORIES(${TOKUFRACTALTREE_RELEASE_DIR}/include)
FIND_LIBRARY(TOKUFRACTALTREE_LIB NAMES ${TOKUFRACTALTREE_LIBNAME} HINTS ${TOKUFRACTALTREE_RELEASE_DIR}/lib) FIND_LIBRARY(TOKUFRACTALTREE_LIB NAMES ${TOKUFRACTALTREE_LIBNAME} HINTS ${TOKUFRACTALTREE_RELEASE_DIR}/lib)
FIND_LIBRARY(TOKUPORTABILITY_LIB NAMES tokuportability HINTS ${TOKUFRACTALTREE_RELEASE_DIR}/lib) FIND_LIBRARY(TOKUPORTABILITY_LIB NAMES ${TOKUPORTABILITY_LIBNAME} HINTS ${TOKUFRACTALTREE_RELEASE_DIR}/lib)
SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb") SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb")
SET(TOKUDB_SOURCES hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc) SET(TOKUDB_SOURCES hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc)
......
...@@ -20,7 +20,7 @@ noinst_HEADERS = ...@@ -20,7 +20,7 @@ noinst_HEADERS =
EXTRA_LTLIBRARIES = ha_tokudb.la EXTRA_LTLIBRARIES = ha_tokudb.la
pkgplugin_LTLIBRARIES = @plugin_tokudb_shared_target@ pkgplugin_LTLIBRARIES = @plugin_tokudb_shared_target@
ha_tokudb_la_LIBADD = -L$(TOKUFRACTALTREE)/lib -l$(TOKUFRACTALTREE_LIBNAME) -ltokuportability ha_tokudb_la_LIBADD = -L$(TOKUFRACTALTREE)/lib -l$(TOKUFRACTALTREE_LIBNAME) -l$(TOKUPORTABILITY_LIBNAME)
ha_tokudb_la_LDFLAGS = -module -rpath $(pkgplugindir) ha_tokudb_la_LDFLAGS = -module -rpath $(pkgplugindir)
ha_tokudb_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -DTOKUDB_VERSION=\"$(TOKUDB_VERSION)\" -Wall ha_tokudb_la_CXXFLAGS = $(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN -DTOKUDB_VERSION=\"$(TOKUDB_VERSION)\" -Wall
ha_tokudb_la_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc ha_tokudb_la_SOURCES = hatoku_hton.cc hatoku_cmp.cc ha_tokudb.cc
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment