diff options
| author | Jan Lindström <jplindst@mariadb.org> | 2015-02-19 17:16:56 +0200 |
|---|---|---|
| committer | Jan Lindström <jplindst@mariadb.org> | 2015-02-19 17:16:56 +0200 |
| commit | 792b53e80806df893ee62c9a1c1bd117114c8c6d (patch) | |
| tree | 4a0e473da4ebda36de8d66b5479667280990be94 | |
| parent | 7f66cb0bf90d86a1200790ba40c5e8ca6c678a6d (diff) | |
| download | mariadb-git-792b53e80806df893ee62c9a1c1bd117114c8c6d.tar.gz | |
Fix incorrect merge of extra/CMakeLists.txt
| -rw-r--r-- | extra/CMakeLists.txt | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 2d23115fe08..3f87bb2df62 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -96,23 +96,3 @@ IF(UNIX) MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) TARGET_LINK_LIBRARIES(mysql_waitpid mysys) ENDIF() - - - # Add path to the InnoDB headers - INCLUDE_DIRECTORIES( - ${CMAKE_SOURCE_DIR}/storage/innobase/include - ${CMAKE_SOURCE_DIR}/sql) - - # We use the InnoDB code directly in case the code changes. - ADD_DEFINITIONS("-DUNIV_INNOCHECKSUM") - SET(INNOBASE_SOURCES - ../storage/innobase/buf/buf0checksum.cc - ../storage/innobase/ut/ut0crc32.cc - ../storage/innobase/ut/ut0ut.cc - ../storage/innobase/page/page0zip.cc - ) - - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) - ADD_DEPENDENCIES(innochecksum GenError) - |