| CMakeLists.txt | CMakeLists.txt | |||
|---|---|---|---|---|
| skipping to change at line 185 | skipping to change at line 185 | |||
| SET(GTEST_LIBRARIES gmock gtest) | SET(GTEST_LIBRARIES gmock gtest) | |||
| IF (WITH_SSL STREQUAL "bundled") | IF (WITH_SSL STREQUAL "bundled") | |||
| ADD_SUBDIRECTORY(yassl) | ADD_SUBDIRECTORY(yassl) | |||
| ENDIF() | ENDIF() | |||
| INCLUDE_DIRECTORIES( | INCLUDE_DIRECTORIES( | |||
| ${CMAKE_SOURCE_DIR}/include | ${CMAKE_SOURCE_DIR}/include | |||
| ${CMAKE_SOURCE_DIR}/regex | ${CMAKE_SOURCE_DIR}/regex | |||
| ${CMAKE_SOURCE_DIR}/sql | ${CMAKE_SOURCE_DIR}/sql | |||
| ${CMAKE_SOURCE_DIR}/unittest/mytap | ||||
| ${CMAKE_SOURCE_DIR}/storage/example | ${CMAKE_SOURCE_DIR}/storage/example | |||
| ) | ) | |||
| CHECK_C_COMPILER_FLAG("-Wno-null-dereference" HAVE_NO_NULL) | INCLUDE(CheckCXXCompilerFlag) | |||
| CHECK_CXX_COMPILER_FLAG("-Wno-null-dereference" HAVE_NO_NULL) | ||||
| IF(HAVE_NO_NULL) | IF(HAVE_NO_NULL) | |||
| SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-null-dereference") | SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-null-dereference") | |||
| ENDIF() | ENDIF() | |||
| # main-wrapper libraries (with tap-compatible option). | # main-wrapper libraries (with tap-compatible option). | |||
| ADD_LIBRARY(gunit_small STATIC | ADD_LIBRARY(gunit_small STATIC | |||
| gunit_test_main.cc tap_event_listener.cc thread_utils.cc) | gunit_test_main.cc tap_event_listener.cc thread_utils.cc) | |||
| ADD_LIBRARY(gunit_large STATIC | ADD_LIBRARY(gunit_large STATIC | |||
| gunit_test_main_server.cc test_utils.cc tap_event_listener.cc thread_util s.cc) | gunit_test_main_server.cc test_utils.cc tap_event_listener.cc thread_util s.cc) | |||
| ADD_DEPENDENCIES(gunit_small GenError) | ADD_DEPENDENCIES(gunit_small GenError) | |||
| skipping to change at line 247 | skipping to change at line 247 | |||
| sql_string | sql_string | |||
| stdcxx | stdcxx | |||
| thread_utils | thread_utils | |||
| ) | ) | |||
| # Add tests (link them with gunit/gmock libraries and the server libraries) | # Add tests (link them with gunit/gmock libraries and the server libraries) | |||
| SET(SERVER_TESTS | SET(SERVER_TESTS | |||
| copy_info | copy_info | |||
| create_field | create_field | |||
| delayable_insert_operation | delayable_insert_operation | |||
| explain_filename | ||||
| field | field | |||
| get_diagnostics | get_diagnostics | |||
| handler | handler | |||
| item | item | |||
| item_func_now_local | item_func_now_local | |||
| item_timefunc | item_timefunc | |||
| join_tab_sort | join_tab_sort | |||
| make_sortkey | make_sortkey | |||
| my_decimal | my_decimal | |||
| opt_range | opt_range | |||
| End of changes. 3 change blocks. | ||||
| 2 lines changed or deleted | 3 lines changed or added | |||
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/ | ||||