Revision: 45766
http://brlcad.svn.sourceforge.net/brlcad/?rev=45766&view=rev
Author: starseeker
Date: 2011-08-02 20:05:14 +0000 (Tue, 02 Aug 2011)
Log Message:
-----------
Some cleanup and typo fixes, make the ADD_NEW_FLAG macro a bit more flexible
Modified Paths:
--------------
brlcad/trunk/misc/CMake/CompilerFlags.cmake
Modified: brlcad/trunk/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/CompilerFlags.cmake 2011-08-02 19:52:38 UTC (rev
45765)
+++ brlcad/trunk/misc/CMake/CompilerFlags.cmake 2011-08-02 20:05:14 UTC (rev
45766)
@@ -6,15 +6,28 @@
# the variables we want to assign flags to into a common
# 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}")
+ ENDIF(${NEW_FLAG})
STRING(TOUPPER "${CMAKE_BUILD_TYPE}" BUILD_TYPE)
IF(BUILD_TYPE)
- SET(CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE}
"${CMAKE_${FLAG_TYPE}_FLAGS_${BUILD_TYPE}} ${${NEW_FLAG}}")
+ 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}
${${NEW_FLAG}}")
+ 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)
- SET(CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE}
"${CMAKE_${FLAG_TYPE}_FLAGS_${CFG_TYPE}} ${${NEW_FLAG}}")
+ 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)
@@ -38,8 +51,7 @@
IF(${ARGC} LESS 2)
CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG)
IF(${UPPER_FLAG}_COMPILER_FLAG)
- SET(NEW_FLAG "-${flag}")
- ADD_NEW_FLAG(C NEW_FLAG)
+ ADD_NEW_FLAG(C "-${flag}")
ENDIF(${UPPER_FLAG}_COMPILER_FLAG)
ELSE(${ARGC} LESS 2)
IF(NOT ${ARGV1})
@@ -62,8 +74,7 @@
IF(${ARGC} LESS 2)
CHECK_CXX_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG)
IF(${UPPER_FLAG}_COMPILER_FLAG)
- SET(NEW_FLAG "-${flag}")
- ADD_NEW_FLAG(CXX NEW_FLAG)
+ ADD_NEW_FLAG(CXX "-${flag}")
ENDIF(${UPPER_FLAG}_COMPILER_FLAG)
ELSE(${ARGC} LESS 2)
IF(NOT ${ARGV1})
@@ -244,19 +255,15 @@
CHECK_C_FLAG_GATHER(Winline WARNING_FLAGS)
# Need this for tcl.h
CHECK_C_FLAG_GATHER(Wno-long-long WARNING_FLAGS)
- SET(${C_FLAGS} "${${C_FLAGS}} ${WARNING_FLAGS}")
- SET(${CXX_FLAGS} "${${CXX_FLAGS}} ${WARNING_FLAGS}")
- ADD_NEW_FLAG(C WARNING_FLAG)
- ADD_NEW_FLAG(CXX WARNING_FLAG)
+ ADD_NEW_FLAG(C WARNING_FLAGS)
+ ADD_NEW_FLAG(CXX WARNING_FLAGS)
ENDIF(BRLCAD-ENABLE_COMPILER_WARNINGS OR BRLCAD-ENABLE_STRICT)
MARK_AS_ADVANCED(WARNING_FLAGS)
IF(BRLCAD-ENABLE_STRICT)
CHECK_C_FLAG_GATHER(Werror STRICT_FLAGS)
- SET(${C_FLAGS} "${${C_FLAGS}} ${STRICT_FLAGS}")
- SET(${CXX_FLAGS} "${${CXX_FLAGS}} ${STRICT_FLAGS}")
- ADD_NEW_FLAG(C STRICT_FLAG)
- ADD_NEW_FLAG(CXX STRICT_FLAG)
+ ADD_NEW_FLAG(C STRICT_FLAGS)
+ ADD_NEW_FLAG(CXX STRICT_FLAGS)
ENDIF(BRLCAD-ENABLE_STRICT)
MARK_AS_ADVANCED(STRICT_FLAGS)
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
