Revision: 40600
http://brlcad.svn.sourceforge.net/brlcad/?rev=40600&view=rev
Author: starseeker
Date: 2010-09-17 15:18:31 +0000 (Fri, 17 Sep 2010)
Log Message:
-----------
OK, this should straighten out some of the compiler flag logic.
Modified Paths:
--------------
brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake
Modified: brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake 2010-09-17
14:08:19 UTC (rev 40599)
+++ brlcad/branches/cmake/misc/CMake/CompilerFlags.cmake 2010-09-17
15:18:31 UTC (rev 40600)
@@ -4,27 +4,29 @@
STRING(TOUPPER ${flag} UPPER_FLAG)
STRING(REGEX REPLACE " " "_" UPPER_FLAG ${UPPER_FLAG})
IF(${ARGC} LESS 2)
- CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_FLAG)
+ CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG)
+ ELSE(${ARGC} LESS 2)
+ IF(NOT ${ARGV1})
+ MESSAGE("argv1: ${${ARGV1}}")
+ CHECK_C_COMPILER_FLAG(-${flag}
${UPPER_FLAG}_COMPILER_FLAG)
+ IF(${UPPER_FLAG}_COMPILER_FLAG)
+ MESSAGE("Found - setting ${ARGV1} to -${flag}")
+ SET(${ARGV1} "-${flag}" CACHE STRING "${ARGV1}"
FORCE)
+ ENDIF(${UPPER_FLAG}_COMPILER_FLAG)
+ ENDIF(NOT ${ARGV1})
ENDIF(${ARGC} LESS 2)
- IF(NOT ARGV1)
- CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_FLAG)
- ENDIF(NOT ARGV1)
- IF(${UPPER_FLAG}_FLAG)
- SET(${UPPER_FLAG}_FLAG "-${flag}")
- IF(${ARGC} GREATER 1 AND NOT ${ARGV1})
- MESSAGE("Found - setting ${ARGV1} to -${flag}")
- SET(${ARGV1} "-${flag}" CACHE STRING "${ARGV1}" FORCE)
- ENDIF(${ARGC} GREATER 1 AND NOT ${ARGV1})
- ENDIF(${UPPER_FLAG}_FLAG)
+ IF(${UPPER_FLAG}_COMPILER_FLAG)
+ SET(${UPPER_FLAG}_COMPILER_FLAG "-${flag}")
+ ENDIF(${UPPER_FLAG}_COMPILER_FLAG)
ENDMACRO()
MACRO(CHECK_C_FLAG_GATHER flag FLAGS)
STRING(TOUPPER ${flag} UPPER_FLAG)
STRING(REGEX REPLACE " " "_" UPPER_FLAG ${UPPER_FLAG})
- CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_FLAG)
- IF(${UPPER_FLAG}_FLAG)
+ CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG)
+ IF(${UPPER_FLAG}_COMPILER_FLAG)
SET(${FLAGS} "${${FLAGS}} -${flag}")
- ENDIF(${UPPER_FLAG}_FLAG)
+ ENDIF(${UPPER_FLAG}_COMPILER_FLAG)
ENDMACRO()
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
