diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-07-17 21:24:29 +0200 |
| commit | 97e640b9ae83e07b444fceede6b0524256c7a3cc (patch) | |
| tree | 8f48fbfaf88ea7895ce59fd3ac2fbe6184334387 /CMakeLists.txt | |
| parent | 2f6a2494a5eb2cf3ab06fbedd2584eca85d90230 (diff) | |
| parent | c7973615e723b13c6457b494b72be2fac35bfd18 (diff) | |
| download | mariadb-git-97e640b9ae83e07b444fceede6b0524256c7a3cc.tar.gz | |
5.5 merge
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 70224ae81c8..e7600c64725 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. -# Copyright (c) 2008, 2012 Monty Program Ab +# Copyright (c) 2006, 2013, Oracle and/or its affiliates. +# Copyright (c) 2008, 2013, Monty Program Ab # # 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 @@ -335,6 +335,7 @@ IF(WIN32) ADD_SUBDIRECTORY(win/upgrade_wizard) ADD_SUBDIRECTORY(win/packaging) ENDIF() +ADD_SUBDIRECTORY(packaging/solaris) CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) |