diff options
| author | Alexander Nozdrin <alik@sun.com> | 2010-08-16 10:46:21 +0400 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2010-08-16 10:46:21 +0400 |
| commit | 98f69947aaf8680fa31a01f0da60be64cb9348e5 (patch) | |
| tree | 7ae25fb68988704b083ecd1c2f3f58efc97f4672 /extra | |
| parent | 427efc3a402af5fe4d57fc5468a27278d95fcda6 (diff) | |
| parent | 32edab6bfe4fada3adbf8688375600c8f911c82c (diff) | |
| download | mariadb-git-98f69947aaf8680fa31a01f0da60be64cb9348e5.tar.gz | |
Auto-merge from mysql-5.5.
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | extra/yassl/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | extra/yassl/taocrypt/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 7 deletions
diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt index 27fc31cbdde..a569641a198 100644 --- a/extra/CMakeLists.txt +++ b/extra/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2006 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 diff --git a/extra/yassl/CMakeLists.txt b/extra/yassl/CMakeLists.txt index ea991fee8dc..46e1abbc08e 100644 --- a/extra/yassl/CMakeLists.txt +++ b/extra/yassl/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2006 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,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 diff --git a/extra/yassl/taocrypt/CMakeLists.txt b/extra/yassl/taocrypt/CMakeLists.txt index 1781ea6f2fa..750731a0449 100644 --- a/extra/yassl/taocrypt/CMakeLists.txt +++ b/extra/yassl/taocrypt/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (C) 2006 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,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}/extra/yassl/taocrypt/mySTL ${CMAKE_SOURCE_DIR}/extra/yassl/taocrypt/include) |