diff options
author | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-16 18:16:07 +0300 |
---|---|---|
committer | Georgi Kodinov <Georgi.Kodinov@Oracle.com> | 2010-08-16 18:16:07 +0300 |
commit | 5564e0837f8d6811acd6f8dc0369ec96dcab3c54 (patch) | |
tree | 94f7517b9264a7af5ea2dd14b146c7e10860363b /unittest | |
parent | 37da201f2fde90fc952b22a75eb34274ac2c3494 (diff) | |
parent | 32edab6bfe4fada3adbf8688375600c8f911c82c (diff) | |
download | mariadb-git-5564e0837f8d6811acd6f8dc0369ec96dcab3c54.tar.gz |
merged mysql-5.5 into WL1054-5.5
Diffstat (limited to 'unittest')
-rw-r--r-- | unittest/examples/CMakeLists.txt | 5 | ||||
-rw-r--r-- | unittest/mysys/CMakeLists.txt | 4 | ||||
-rw-r--r-- | unittest/mytap/CMakeLists.txt | 5 |
3 files changed, 6 insertions, 8 deletions
diff --git a/unittest/examples/CMakeLists.txt b/unittest/examples/CMakeLists.txt index a5aa5a93985..52272bc412e 100644 --- a/unittest/examples/CMakeLists.txt +++ b/unittest/examples/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007 MySQL AB +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -11,8 +11,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/zlib ${CMAKE_SOURCE_DIR}/sql diff --git a/unittest/mysys/CMakeLists.txt b/unittest/mysys/CMakeLists.txt index 46f379d3b55..7bf046162c5 100644 --- a/unittest/mysys/CMakeLists.txt +++ b/unittest/mysys/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007 MySQL AB, 2009 Sun Microsystems,Inc +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -11,7 +11,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/sql diff --git a/unittest/mytap/CMakeLists.txt b/unittest/mytap/CMakeLists.txt index 8a2f6c9639a..c4f213e338a 100644 --- a/unittest/mytap/CMakeLists.txt +++ b/unittest/mytap/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2007 MySQL AB, 2009 Sun Microsystems, Inc +# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -11,8 +11,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - +# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include) ADD_LIBRARY(mytap tap.c) |