Bug#14593123 CONFIGURE.PL WITH CMAKE2.8 BREAKS THE BUILD
Ignore --with-client-ldflags it's not supported by the cmake scripts anyways. Ignore --with-mysqld-ldflags it's only used with --with-mysqld-ldflags=-static and that doesn't work.
This commit is contained in:
parent
775b1aebc2
commit
e17c7b2b0b
@ -19,6 +19,7 @@ if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" GREATER 2.6)
|
|||||||
CMAKE_POLICY(VERSION 2.8)
|
CMAKE_POLICY(VERSION 2.8)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
|
||||||
|
|
||||||
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
|
||||||
|
|
||||||
|
@ -211,6 +211,16 @@ foreach my $option (@ARGV)
|
|||||||
$cmakeargs = $cmakeargs." -DENABLE_GCOV=ON";
|
$cmakeargs = $cmakeargs." -DENABLE_GCOV=ON";
|
||||||
next;
|
next;
|
||||||
}
|
}
|
||||||
|
if ($option =~ /with-client-ldflags/)
|
||||||
|
{
|
||||||
|
print("configure.pl : ignoring $option\n");
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
if ($option =~ /with-mysqld-ldflags=/)
|
||||||
|
{
|
||||||
|
print("configure.pl : ignoring $option\n");
|
||||||
|
next;
|
||||||
|
}
|
||||||
|
|
||||||
$option = uc($option);
|
$option = uc($option);
|
||||||
$option =~ s/-/_/g;
|
$option =~ s/-/_/g;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user