Revision: 45768
http://brlcad.svn.sourceforge.net/brlcad/?rev=45768&view=rev
Author: starseeker
Date: 2011-08-03 17:22:48 +0000 (Wed, 03 Aug 2011)
Log Message:
-----------
Was getting too clever for my own good. If ADD_NEW_FLAG comes in empty, don't
do anything - should avoid the error on Windows
Modified Paths:
--------------
brlcad/trunk/misc/CMake/CompilerFlags.cmake
Modified: brlcad/trunk/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/CompilerFlags.cmake 2011-08-03 15:24:04 UTC (rev
45767)
+++ brlcad/trunk/misc/CMake/CompilerFlags.cmake 2011-08-03 17:22:48 UTC (rev
45768)
@@ -7,28 +7,25 @@
# variable that will be used for all routines.
MACRO(ADD_NEW_FLAG FLAG_TYPE NEW_FLAG)
IF(${NEW_FLAG})
- SET(NFLAG "${${NEW_FLAG}}")
- ELSE(${NEW_FLAG})
- SET(NFLAG "${NEW_FLAG}")
+ STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
+ IF(BUILD_TYPE)
+ IF(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE})
+ SET(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE}
"${CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE}} ${${NEW_FLAG}}")
+ ELSE(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE})
+ SET(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE}
"${${NEW_FLAG}}")
+ ENDIF(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE})
+ ELSE(BUILD_TYPE)
+ SET(CMAKE_${FLAG_TYPE}_FLAGS
"${CMAKE_${FLAG_TYPE}_FLAGS} ${${NEW_FLAG}}")
+ ENDIF(BUILD_TYPE)
+ FOREACH(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
+ STRING(TOUPPER "${CFG_TYPE}" CFG_TYPE)
+ IF(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE})
+ SET(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE}
"${CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE}} ${${NEW_FLAG}}")
+ ELSE(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE})
+ SET(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE}
"${${NEW_FLAG}}")
+ ENDIF(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE})
+ ENDFOREACH(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
ENDIF(${NEW_FLAG})
- STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
- IF(BUILD_TYPE)
- IF(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE})
- SET(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE}
"${CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE}} ${NFLAG}")
- ELSE(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE})
- SET(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE} "${NFLAG}")
- ENDIF(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE})
- ELSE(BUILD_TYPE)
- SET(CMAKE_${FLAG_TYPE}_FLAGS "${CMAKE_${FLAG_TYPE}_FLAGS}
${NFLAG}")
- ENDIF(BUILD_TYPE)
- FOREACH(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
- STRING(TOUPPER "${CFG_TYPE}" CFG_TYPE)
- IF(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE})
- SET(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE}
"${CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE}} ${NFLAG}")
- ELSE(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE})
- SET(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE} "${NFLAG}")
- ENDIF(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE})
- ENDFOREACH(CFG_TYPE ${CMAKE_CONFIGURATION_TYPES})
ENDMACRO(ADD_NEW_FLAG)
STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
@@ -51,7 +48,8 @@
IF(${ARGC} LESS 2)
CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG)
IF(${UPPER_FLAG}_COMPILER_FLAG)
- ADD_NEW_FLAG(C "-${flag}")
+ SET(NEW_FLAG "-${flag}")
+ ADD_NEW_FLAG(C NEW_FLAG)
ENDIF(${UPPER_FLAG}_COMPILER_FLAG)
ELSE(${ARGC} LESS 2)
IF(NOT ${ARGV1})
@@ -74,7 +72,8 @@
IF(${ARGC} LESS 2)
CHECK_CXX_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG)
IF(${UPPER_FLAG}_COMPILER_FLAG)
- ADD_NEW_FLAG(CXX "-${flag}")
+ SET(NEW_FLAG "-${flag}")
+ ADD_NEW_FLAG(CXX NEW_FLAG)
ENDIF(${UPPER_FLAG}_COMPILER_FLAG)
ELSE(${ARGC} LESS 2)
IF(NOT ${ARGV1})
@@ -261,7 +260,7 @@
MARK_AS_ADVANCED(WARNING_FLAGS)
IF(BRLCAD-ENABLE_STRICT)
- CHECK_C_FLAG_GATHER(Werror STRICT_FLAGS)
+ CHECK_C_FLAG_GATHER(Werror STRICT_FLAGS)
ADD_NEW_FLAG(C STRICT_FLAGS)
ADD_NEW_FLAG(CXX STRICT_FLAGS)
ENDIF(BRLCAD-ENABLE_STRICT)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
BlackBerry® DevCon Americas, Oct. 18-20, San Francisco, CA
The must-attend event for mobile developers. Connect with experts.
Get tools for creating Super Apps. See the latest technologies.
Sessions, hands-on labs, demos & much more. Register early & save!
http://p.sf.net/sfu/rim-blackberry-1
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
