Revision: 56757
http://sourceforge.net/p/brlcad/code/56757
Author: brlcad
Date: 2013-08-12 20:01:48 +0000 (Mon, 12 Aug 2013)
Log Message:
-----------
fix a bug when checking C and CXX flags sequentially, the latter was always
getting the cached result because the same cache variable name was being
specified. this was presenting itself as CC: unrecognized option
'-Qunused-argument' messages (which is apparently not a valid C++ flag, but is
valid for C) and potentially any other flag where the result should be
different (obviously).
Modified Paths:
--------------
brlcad/trunk/misc/CMake/CompilerFlags.cmake
Modified: brlcad/trunk/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/CompilerFlags.cmake 2013-08-12 19:29:18 UTC (rev
56756)
+++ brlcad/trunk/misc/CMake/CompilerFlags.cmake 2013-08-12 20:01:48 UTC (rev
56757)
@@ -123,10 +123,10 @@
if(${ARGC} LESS 3)
# Handle default (global) case
- CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- if(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+ CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
+ if(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
ADD_NEW_FLAG(${FLAG_LANG} NEW_FLAG ALL)
- endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+ endif(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
else(${ARGC} LESS 3)
@@ -135,34 +135,34 @@
# Iterate over listed Build types and append the flag to them if
successfully tested.
foreach(build_type ${FLAG_BUILD_TYPES})
- CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- if(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+ CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
+ if(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
ADD_NEW_FLAG(${FLAG_LANG} NEW_FLAG "${build_type}")
- endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+ endif(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
endforeach(build_type ${FLAG_BUILD_TYPES})
# Append flag to a group of flags (this apparently needs to be
# a string build, not a CMake list build. Do this for all supplied
# group variables.
foreach(flag_group ${FLAG_GROUPS})
- CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- if(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+ CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
+ if(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
if(${flag_group})
set(${flag_group} "${${flag_group}} ${NEW_FLAG}")
else(${flag_group})
set(${flag_group} "${NEW_FLAG}")
endif(${flag_group})
- endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+ endif(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
endforeach(flag_group ${FLAG_GROUPS})
# If a variable does not have a value, check the flag and if valid assign
# the flag as the variable's value. Do this for all supplied variables.
foreach(flag_var ${FLAG_VARS})
if(NOT ${flag_var})
- CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- if(${UPPER_FLAG}_COMPILER_FLAG_FOUND AND NOT "${${flag_var}}")
+ CHECK_COMPILER_FLAG(${FLAG_LANG} ${NEW_FLAG}
${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND)
+ if(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND AND NOT "${${flag_var}}")
set(${flag_var} "${NEW_FLAG}")
- endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND AND NOT "${${flag_var}}")
+ endif(${UPPER_FLAG}_${FLAG_LANG}_FLAG_FOUND AND NOT "${${flag_var}}")
endif(NOT ${flag_var})
endforeach(flag_var ${FLAG_VARS})
endif(${ARGC} LESS 3)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Get 100% visibility into Java/.NET code with AppDynamics Lite!
It's a free troubleshooting tool designed for production.
Get down to code-level detail for bottlenecks, with <2% overhead.
Download for free and get started troubleshooting in minutes.
http://pubads.g.doubleclick.net/gampad/clk?id=48897031&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
