diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2015-01-15 09:44:21 +0100 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2015-01-15 09:55:01 +0100 |
| commit | 2750b4b7386741945ae47bf22bba78d0b7792764 (patch) | |
| tree | f820c99d5f2b7e0d308f9ed8f22852a71bc0b292 /cmake/compile_flags.cmake | |
| parent | e84b3fd4ff5053d7335ad4296188fa8149939296 (diff) | |
| download | mariadb-git-2750b4b7386741945ae47bf22bba78d0b7792764.tar.gz | |
Bug#20344207: Add support for CMake 3.1
Rename a CMake variable in compile_flags.cmake to avoid triggering
CMake 3.1 warning about CMP0054 about interpreting if() arguments
as keywords or variables.
No changes in behavior.
Diffstat (limited to 'cmake/compile_flags.cmake')
| -rw-r--r-- | cmake/compile_flags.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmake/compile_flags.cmake b/cmake/compile_flags.cmake index 5e872f981b0..b39bf7b79d6 100644 --- a/cmake/compile_flags.cmake +++ b/cmake/compile_flags.cmake @@ -1,4 +1,4 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2015, 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 @@ -18,11 +18,11 @@ MACRO(ADD_COMPILE_FLAGS) SET(FILES "") SET(FLAGS "") - SET(COMPILE_FLAGS) + SET(COMPILE_FLAGS_SEEN) FOREACH(ARG ${ARGV}) IF(ARG STREQUAL "COMPILE_FLAGS") - SET(COMPILE_FLAGS "COMPILE_FLAGS") - ELSEIF(COMPILE_FLAGS) + SET(COMPILE_FLAGS_SEEN 1) + ELSEIF(COMPILE_FLAGS_SEEN) LIST(APPEND FLAGS ${ARG}) ELSE() LIST(APPEND FILES ${ARG}) |