#10 change handlerton cmake to include ft-index directly

storage/tokudb/CMakeLists.txt

@@ -8,15 +8,22 @@ IF(DEFINED ENV{TOKUDB_PATCHES})
     ADD_DEFINITIONS("-DTOKUDB_PATCHES=${TOKUDB_PATCHES}")
 ENDIF()
 
-SET(TOKUFRACTALTREE_RELEASE_DIR $ENV{TOKUFRACTALTREE})
-SET(TOKUFRACTALTREE_LIBNAME $ENV{TOKUFRACTALTREE_LIBNAME})
-SET(TOKUPORTABILITY_LIBNAME $ENV{TOKUPORTABILITY_LIBNAME})
+SET(LIBTOKUPORTABILITY tokuportability)
+SET(LIBTOKUDB tokufractaltree)
 
-INCLUDE_DIRECTORIES(${TOKUFRACTALTREE_RELEASE_DIR}/include)
-FIND_LIBRARY(TOKUFRACTALTREE_LIB NAMES ${TOKUFRACTALTREE_LIBNAME} HINTS ${TOKUFRACTALTREE_RELEASE_DIR}/lib)
-FIND_LIBRARY(TOKUPORTABILITY_LIB NAMES ${TOKUPORTABILITY_LIBNAME} HINTS ${TOKUFRACTALTREE_RELEASE_DIR}/lib)
+ADD_SUBDIRECTORY(ft-index)
+
+# TODO: clean up includes in ft-index
+INCLUDE_DIRECTORIES(ft-index)
+INCLUDE_DIRECTORIES(ft-index/include)
+INCLUDE_DIRECTORIES(ft-index/portability)
+INCLUDE_DIRECTORIES(ft-index/toku_include)
+INCLUDE_DIRECTORIES(ft-index/util)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/ft-index/buildheader)
 
 SET(TOKUDB_PLUGIN_DYNAMIC "ha_tokudb")
 SET(TOKUDB_SOURCES ha_tokudb.cc)
-MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY LINK_LIBRARIES ${TOKUFRACTALTREE_LIB} ${TOKUPORTABILITY_LIB} z stdc++)
+MYSQL_ADD_PLUGIN(tokudb ${TOKUDB_SOURCES} STORAGE_ENGINE MODULE_ONLY
+    LINK_LIBRARIES ${LIBTOKUDB}_static ${LIBTOKUPORTABILITY}_static z stdc++)
 SET_PROPERTY(TARGET tokudb APPEND PROPERTY LINK_FLAGS_RELEASE "-flto -fuse-linker-plugin")