diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2012-10-19 20:38:59 +0200 |
| commit | e1f681c99b3e5462c033aaafa94ac295e626cde2 (patch) | |
| tree | 2da5eff1a0d03831c2d85b32a7bc3df6ec37b522 /cmake | |
| parent | 52c84d144d3b07966d9b3bab8694eb012eef69ce (diff) | |
| parent | 807fef40fffbbb8e92564a52b902b504ba8cfcdc (diff) | |
| download | mariadb-git-e1f681c99b3e5462c033aaafa94ac295e626cde2.tar.gz | |
10.0-base -> 10.0-monty
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/configure.pl | 7 | ||||
| -rw-r--r-- | cmake/cpack_rpm.cmake | 1 | ||||
| -rw-r--r-- | cmake/maintainer.cmake | 2 | ||||
| -rw-r--r-- | cmake/os/WindowsCache.cmake | 3 | ||||
| -rw-r--r-- | cmake/readline.cmake | 2 |
5 files changed, 14 insertions, 1 deletions
diff --git a/cmake/configure.pl b/cmake/configure.pl index 69f973c41fb..3a7d187c0be 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -25,6 +25,7 @@ my $cmakeargs = ""; # Assume this script is in <srcroot>/cmake my $srcdir = dirname(dirname(abs_path($0))); my $cmake_install_prefix=""; +my $just_print= 0; # Sets installation directory, bindir, libdir, libexecdir etc # the equivalent CMake variables are given without prefix @@ -113,6 +114,11 @@ foreach my $option (@ARGV) system("cmake ${srcdir} -LH"); exit(0); } + if ($option =~ /print/) + { + $just_print=1; + next; + } if($option =~ /with-plugins=/) { my @plugins= split(/,/, substr($option,13)); @@ -223,6 +229,7 @@ foreach my $option (@ARGV) } print("configure.pl : calling cmake $srcdir $cmakeargs\n"); +exit(0) if ($just_print); unlink("CMakeCache.txt"); my $rc = system("cmake $srcdir $cmakeargs"); exit($rc); diff --git a/cmake/cpack_rpm.cmake b/cmake/cpack_rpm.cmake index 8e70af6c5a9..e915e732612 100644 --- a/cmake/cpack_rpm.cmake +++ b/cmake/cpack_rpm.cmake @@ -65,6 +65,7 @@ SET(CPACK_RPM_SPEC_MORE_DEFINE "${CPACK_RPM_SPEC_MORE_DEFINE} SET(CPACK_RPM_PACKAGE_REQUIRES "MariaDB-common") SET(CPACK_RPM_server_USER_FILELIST "%ignore /etc" "%ignore /etc/init.d") +SET(CPACK_RPM_common_USER_FILELIST "%config(noreplace) /etc/my.cnf") SET(CPACK_RPM_client_PACKAGE_OBSOLETES "mysql-client MySQL-client MySQL-OurDelta-client") SET(CPACK_RPM_client_PACKAGE_PROVIDES "MariaDB-client MySQL-client mysql-client") diff --git a/cmake/maintainer.cmake b/cmake/maintainer.cmake index a70226e2b6e..d52405e8bcc 100644 --- a/cmake/maintainer.cmake +++ b/cmake/maintainer.cmake @@ -18,7 +18,7 @@ INCLUDE(CheckCCompilerFlag) # Setup GCC (GNU C compiler) warning options. MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS) SET(MY_MAINTAINER_WARNINGS - "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -DFORCE_INIT_OF_VARS") + "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Wno-invalid-offsetof -DFORCE_INIT_OF_VARS") CHECK_C_COMPILER_FLAG("-Wno-missing-field-initializers" HAVE_NO_MISSING_FIELD_INITIALIZERS) diff --git a/cmake/os/WindowsCache.cmake b/cmake/os/WindowsCache.cmake index 8456cd69b0b..b93a1c12a2e 100644 --- a/cmake/os/WindowsCache.cmake +++ b/cmake/os/WindowsCache.cmake @@ -364,4 +364,7 @@ SET(HAVE_SOCKADDR_IN_SIN_LEN CACHE INTERNAL "") SET(HAVE_SOCKADDR_IN6_SIN6_LEN CACHE INTERNAL "") SET(HAVE_VALGRIND CACHE INTERNAL "") SET(HAVE_EVENT_H CACHE INTERNAL "") +SET(HAVE_LINUX_UNISTD_H CACHE INTERNAL "") +SET(HAVE_SYS_UTSNAME_H CACHE INTERNAL "") +SET(HAVE_PTHREAD_ATTR_GETGUARDSIZE CACHE INTERNAL "") ENDIF() diff --git a/cmake/readline.cmake b/cmake/readline.cmake index fd2e690fab9..285b436921e 100644 --- a/cmake/readline.cmake +++ b/cmake/readline.cmake @@ -109,6 +109,8 @@ MACRO (FIND_CURSES) ENDIF() ENDIF() ENDIF() + CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} setupterm "" HAVE_SETUPTERM) + CHECK_LIBRARY_EXISTS(${CURSES_LIBRARY} vidattr "" HAVE_VIDATTR) ENDMACRO() MACRO (MYSQL_USE_BUNDLED_READLINE) |