Commit 2750b4b7 authored by Jon Olav Hauglid's avatar Jon Olav Hauglid

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.
parent e84b3fd4
# 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 # 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 # it under the terms of the GNU General Public License as published by
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
MACRO(ADD_COMPILE_FLAGS) MACRO(ADD_COMPILE_FLAGS)
SET(FILES "") SET(FILES "")
SET(FLAGS "") SET(FLAGS "")
SET(COMPILE_FLAGS) SET(COMPILE_FLAGS_SEEN)
FOREACH(ARG ${ARGV}) FOREACH(ARG ${ARGV})
IF(ARG STREQUAL "COMPILE_FLAGS") IF(ARG STREQUAL "COMPILE_FLAGS")
SET(COMPILE_FLAGS "COMPILE_FLAGS") SET(COMPILE_FLAGS_SEEN 1)
ELSEIF(COMPILE_FLAGS) ELSEIF(COMPILE_FLAGS_SEEN)
LIST(APPEND FLAGS ${ARG}) LIST(APPEND FLAGS ${ARG})
ELSE() ELSE()
LIST(APPEND FILES ${ARG}) LIST(APPEND FILES ${ARG})
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment