diff options
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/Makefile.am | 2 | ||||
| -rw-r--r-- | cmake/configure.pl | 45 |
2 files changed, 45 insertions, 2 deletions
diff --git a/cmake/Makefile.am b/cmake/Makefile.am index 86244a526c1..334c9fc7a0e 100644 --- a/cmake/Makefile.am +++ b/cmake/Makefile.am @@ -25,7 +25,7 @@ EXTRA_DIST = \ mysql_add_executable.cmake \ install_layout.cmake \ build_configurations/mysql_release.cmake \ - os/Windows.cmake \ + os/Windows.cmake \ os/WindowsCache.cmake \ os/Linux.cmake \ os/SunOS.cmake \ diff --git a/cmake/configure.pl b/cmake/configure.pl index 52c57011ce0..50225a0ef5e 100644 --- a/cmake/configure.pl +++ b/cmake/configure.pl @@ -38,12 +38,55 @@ sub set_installdir } } +# CMake understands CC and CXX env.variables correctly, if they contain 1 or 2 tokens +# e.g CXX=gcc and CXX="ccache gcc" are ok. However it could have a problem if there +# (recognizing gcc) with more tokens ,e.g CXX="ccache gcc --pipe". +# The problem is simply fixed by splitting compiler and flags, e.g +# CXX="ccache gcc --pipe" => CXX=ccache gcc CXXFLAGS=--pipe + +sub check_compiler +{ + my ($varname, $flagsvarname) = @_; + my @tokens = split(/ /,$ENV{$varname}); + if($#tokens >= 2) + { + $ENV{$varname} = $tokens[0]." ".$tokens[1]; + my $flags; + + for(my $i=2; $i<=$#tokens; $i++) + { + $flags= $flags." ".$tokens[$i]; + } + if(defined $ENV{$flagsvarname}) + { + $flags = $flags." ".$ENV{$flagsvarname}; + } + $ENV{$flagsvarname}=$flags; + print("$varname=$ENV{$varname}\n"); + print("$flagsvarname=$ENV{$flagsvarname}\n"); + } +} + +check_compiler("CC", "CFLAGS"); +check_compiler("CXX", "CXXFLAGS"); + foreach my $option (@ARGV) { - if (substr ($option, 0, 2) == "--") + if (substr ($option, 0, 2) eq "--") { $option = substr($option, 2); } + else + { + # This must be environment variable + my @v = split('=', $option); + my $name = shift(@v); + if(@v) + { + $ENV{$name} = join('=', @v); + } + next; + } if($option =~ /srcdir/) { $srcdir = substr($option,7); |