diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-04 13:50:52 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2015-05-04 13:50:52 -0400 |
| commit | d2562004c5ac118b399475195b08f17fe673e481 (patch) | |
| tree | 51e261ceee484919e6b5a72eaf1f8535e83ab90c /cmake | |
| parent | 42f99d00eee0023184c6d985fa6f4e7a9717c3d8 (diff) | |
| parent | 4c87f727734955f9e4a0ffde25aae4d43ec0b2a5 (diff) | |
| download | mariadb-git-d2562004c5ac118b399475195b08f17fe673e481.tar.gz | |
Merge tag 'mariadb-5.5.43' into 5.5-galera
Diffstat (limited to '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}) |