Revision: 54029
http://brlcad.svn.sourceforge.net/brlcad/?rev=54029&view=rev
Author: starseeker
Date: 2012-12-07 22:58:22 +0000 (Fri, 07 Dec 2012)
Log Message:
-----------
Needs more testing, but use CMakeParseArguments macro to simplify the
CompilerFlags logic. Consolidate the C and CXX macros into a single macro.
Modified Paths:
--------------
brlcad/trunk/misc/CMake/BRLCAD_CompilerFlags.cmake
brlcad/trunk/misc/CMake/CompilerFlags.cmake
Modified: brlcad/trunk/misc/CMake/BRLCAD_CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_CompilerFlags.cmake 2012-12-07 20:08:31 UTC
(rev 54028)
+++ brlcad/trunk/misc/CMake/BRLCAD_CompilerFlags.cmake 2012-12-07 22:58:22 UTC
(rev 54029)
@@ -40,6 +40,25 @@
# -fast-math results in non-IEEE floating point math among a handful
# of other optimizations that cause substantial error in ray tracing
# and tessellation (and probably more).
+BRLCAD_CHECK_C_FLAG(O3 GROUPS OPTIMIZE_C_FLAGS)
+BRLCAD_CHECK_C_FLAG(fstrength-reduce GROUPS OPTIMIZE_C_FLAGS)
+BRLCAD_CHECK_C_FLAG(fexpensive-optimizations GROUPS OPTIMIZE_C_FLAGS)
+BRLCAD_CHECK_C_FLAG(finline-functions GROUPS OPTIMIZE_C_FLAGS)
+BRLCAD_CHECK_C_FLAG("finline-limit=10000 --param inline-unit-growth=300
--param large-function-growth=300" GROUPS OPTIMIZE_C_FLAGS)
+BRLCAD_CHECK_CXX_FLAG(O3 GROUPS OPTIMIZE_CXX_FLAGS)
+BRLCAD_CHECK_CXX_FLAG(fstrength-reduce GROUPS OPTIMIZE_CXX_FLAGS)
+BRLCAD_CHECK_CXX_FLAG(fexpensive-optimizations GROUPS OPTIMIZE_CXX_FLAGS)
+BRLCAD_CHECK_CXX_FLAG(finline-functions GROUPS OPTIMIZE_CXX_FLAGS)
+BRLCAD_CHECK_CXX_FLAG("finline-limit=10000 --param inline-unit-growth=300
--param large-function-growth=300" GROUPS OPTIMIZE_CXX_FLAGS)
+if(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
+ if(NOT BRLCAD_ENABLE_PROFILING AND NOT BRLCAD_FLAGS_DEBUG)
+ BRLCAD_CHECK_C_FLAG(fomit-frame-pointer GROUPS OPTIMIZE_C_FLAGS)
+ BRLCAD_CHECK_CXX_FLAG(fomit-frame-pointer GROUPS OPTIMIZE_CXX_FLAGS)
+ else(NOT BRLCAD_ENABLE_PROFILING AND NOT BRLCAD_FLAGS_DEBUG)
+ BRLCAD_CHECK_C_FLAG(fno-omit-frame-pointer GROUPS OPTIMIZE_C_FLAGS)
+ BRLCAD_CHECK_CXX_FLAG(fno-omit-frame-pointer GROUPS OPTIMIZE_CXX_FLAGS)
+ endif(NOT BRLCAD_ENABLE_PROFILING AND NOT BRLCAD_FLAGS_DEBUG)
+endif(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
if(${BRLCAD_FLAGS_OPTIMIZATION} MATCHES "AUTO")
if(CMAKE_CONFIGURATION_TYPES)
@@ -55,25 +74,8 @@
endif(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
endif(${BRLCAD_FLAGS_OPTIMIZATION} MATCHES "AUTO")
if(opt_conf_list)
- BRLCAD_CHECK_C_FLAG(O3 "${opt_conf_list}")
- BRLCAD_CHECK_C_FLAG(fstrength-reduce "${opt_conf_list}")
- BRLCAD_CHECK_C_FLAG(fexpensive-optimizations "${opt_conf_list}")
- BRLCAD_CHECK_C_FLAG(finline-functions "${opt_conf_list}")
- BRLCAD_CHECK_C_FLAG("finline-limit=10000 --param inline-unit-growth=300
--param large-function-growth=300" "${opt_conf_list}")
- BRLCAD_CHECK_CXX_FLAG(O3 "${opt_conf_list}")
- BRLCAD_CHECK_CXX_FLAG(fstrength-reduce "${opt_conf_list}")
- BRLCAD_CHECK_CXX_FLAG(fexpensive-optimizations "${opt_conf_list}")
- BRLCAD_CHECK_CXX_FLAG(finline-functions "${opt_conf_list}")
- BRLCAD_CHECK_CXX_FLAG("finline-limit=10000 --param inline-unit-growth=300
--param large-function-growth=300" "${opt_conf_list}")
- if(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
- if(NOT BRLCAD_ENABLE_PROFILING AND NOT BRLCAD_FLAGS_DEBUG)
- BRLCAD_CHECK_C_FLAG(fomit-frame-pointer "${opt_conf_list}")
- BRLCAD_CHECK_CXX_FLAG(fomit-frame-pointer "${opt_conf_list}")
- else(NOT BRLCAD_ENABLE_PROFILING AND NOT BRLCAD_FLAGS_DEBUG)
- BRLCAD_CHECK_C_FLAG(fno-omit-frame-pointer "${opt_conf_list}")
- BRLCAD_CHECK_CXX_FLAG(fno-omit-frame-pointer "${opt_conf_list}")
- endif(NOT BRLCAD_ENABLE_PROFILING AND NOT BRLCAD_FLAGS_DEBUG)
- endif(${BRLCAD_OPTIMIZED_BUILD} MATCHES "ON")
+ ADD_NEW_FLAG(C OPTIMIZE_C_FLAGS "${opt_conf_list}")
+ ADD_NEW_FLAG(CXX OPTIMIZE_CXX_FLAGS "${opt_conf_list}")
endif(opt_conf_list)
# verbose warning flags
Modified: brlcad/trunk/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/CompilerFlags.cmake 2012-12-07 20:08:31 UTC (rev
54028)
+++ brlcad/trunk/misc/CMake/CompilerFlags.cmake 2012-12-07 22:58:22 UTC (rev
54029)
@@ -69,107 +69,114 @@
endif(${NEW_FLAG})
endmacro(ADD_NEW_FLAG)
-# Synopsis: BRLCAD_CHECK_C_FLAG(flag [CONFIGURATIONS] [GATHERING VARIABLES]
[UNIQUE VAL VARIABLES])
+# Convenience language based wrapper for calling the correct compiler flag
test macro
+macro(CHECK_COMPILER_FLAG FLAG_LANG NEW_FLAG RESULTVAR)
+ if("${FLAG_LANG}" STREQUAL "C")
+ CHECK_C_COMPILER_FLAG(${NEW_FLAG} ${RESULTVAR})
+ endif("${FLAG_LANG}" STREQUAL "C")
+ if("${FLAG_LANG}" STREQUAL "CXX")
+ CHECK_CXX_COMPILER_FLAG(${NEW_FLAG} ${RESULTVAR})
+ endif("${FLAG_LANG}" STREQUAL "CXX")
+endmacro(CHECK_COMPILER_FLAG LANG NEW_FLAG RESULTVAR)
+
+
+# Synopsis: BRLCAD_CHECK_FLAG(LANG flag [BUILD_TYPES type1 type2 ...] [GROUPS
group1 group2 ...] [VARS var1 var2 ...] )
#
-# Configurations refers to the C_FLAGS variable associated with build
configurations such
-# as CMAKE_C_FLAGS_DEBUG. Gathering variables are variables intended to hold
more than one
-# compilation flag. Unique value variables are intended to hold exactly one
flag, and will
-# not accept overwriting by this macro once a value has been assigned.
+# BRLCAD_CHECK_FLAG is BRL-CAD's core macro for C/C++ flag testing. The first
value
+# is the language to test (C or C++ currently). The second entry is the flag
(without
+# preliminary dash).
#
-# For example, to test a flag and add it to the Debug configuration:
+# If the first two mandatory options are the only ones provided, the a
successful test
+# of the flag will result in its being assigned to *all* compilations using
the appropriate global
+# C/C++ CMake variable. If optional parameters are included, they tell the
macro what to do with the
+# test results instead of doing the default global assignment. Options
include assigning the
+# flag to one or more of the variable lists associated with build types (e.g.
Debug or Release),
+# appending the variable to a string that contains a group of variables, or
assigning the flag to
+# a variable if that variable does not already hold a value. The assignments
are not mutually
+# exclusive - any or all of them may be used in a given command.
#
-# BRLCAD_CHECK_C_FLAG(ggdb3 Debug)
+# For example, to test a flag and add it to the C Debug configuration flags:
#
-# To assign a flag to a unique variable:
+# BRLCAD_CHECK_FLAG(C ggdb3 BUILD_TYPES Debug)
#
-# BRLCAD_CHECK_C_FLAG(c99 "" "" C99_FLAG)
+# To assign a C flag to a unique variable:
#
+# BRLCAD_CHECK_FLAG(C c99 VARS C99_FLAG)
+#
# To do all assignments at once, for multiple configs and vars:
#
-# BRLCAD_CHECK_C_FLAG(ggdb3 "Debug;Release" "DEBUG_FLAGS" "DEBUG1;DEBUG2")
-#
-# For configurations, the keyword ALL is used for a flag that is
-# supposed to be present regardless of configuration - this is
-# the default. After all flags are assigned, CMAKE_C_FLAGS (which
-# collects the general C flags) is prepended to all other active
-# C flag strings.
-#
-# TODO - rework these macros to make use of CMakeParseArguments, see
-# http://www.cmake.org/pipermail/cmake/2012-July/051309.html
-#
-macro(BRLCAD_CHECK_C_FLAG flag)
+# BRLCAD_CHECK_FLAG(C ggdb3
+# BUILD_TYPES Debug Release
+# GROUPS DEBUG_FLAGS
+# VARS DEBUG1 DEBUG2)
+
+include (CMakeParseArguments)
+macro(BRLCAD_CHECK_FLAG)
+ # Set up some variables and names
+ set(FLAG_LANG ${ARGV0})
+ set(flag ${ARGV1})
string(TOUPPER ${flag} UPPER_FLAG)
string(REGEX REPLACE "[^a-zA-Z0-9]" "_" UPPER_FLAG ${UPPER_FLAG})
set(NEW_FLAG "-${flag}")
- if(${ARGC} LESS 2)
- CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+
+ # Start processing arguments
+ 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)
- ADD_NEW_FLAG(C NEW_FLAG ALL)
+ ADD_NEW_FLAG(${FLAG_LANG} NEW_FLAG ALL)
endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- else(${ARGC} LESS 2)
- if(NOT "${ARGV1}" STREQUAL "")
- CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG_FOUND)
+
+ else(${ARGC} LESS 3)
+
+ # Parse extra arguments
+ CMAKE_PARSE_ARGUMENTS(FLAG "" "" "BUILD_TYPES;GROUPS;VARS" ${ARGN})
+
+ # 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)
- ADD_NEW_FLAG(C NEW_FLAG "${ARGV1}")
+ ADD_NEW_FLAG(C NEW_FLAG "${build_type}")
endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- endif(NOT "${ARGV1}" STREQUAL "")
- if(NOT "${ARGV2}" STREQUAL "")
- CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_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)
- foreach(flagvar ${ARGV2})
- if(${flagvar})
- set(${flagvar} "${${flagvar}} -${flag}")
- else(${flagvar})
- set(${flagvar} "-${flag}")
- endif(${flagvar})
- endforeach(flagvar ${ARGV2})
+ 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(NOT "${ARGV2}" STREQUAL "")
- if(NOT "${ARGV3}" STREQUAL "")
- foreach(flagvar ${ARGV3})
- if(NOT ${flagvar})
- CHECK_C_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- if(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- set(${flagvar} "-${flag}")
- endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- endif(NOT ${flagvar})
- endforeach(flagvar ${ARGV3})
- endif(NOT "${ARGV3}" STREQUAL "")
- endif(${ARGC} LESS 2)
-endmacro()
+ endforeach(flag_group ${FLAG_GROUPS})
-macro(BRLCAD_CHECK_CXX_FLAG flag)
- string(TOUPPER ${flag} UPPER_FLAG)
- string(REGEX REPLACE "[^a-zA-Z0-9]" "_" UPPER_FLAG ${UPPER_FLAG})
- CHECK_CXX_COMPILER_FLAG(-${flag} ${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- if(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
- set(NEW_FLAG "-${flag}")
- if(${ARGC} LESS 2)
- ADD_NEW_FLAG(CXX NEW_FLAG ALL)
- else(${ARGC} LESS 2)
- if(NOT "${ARGV1}" STREQUAL "")
- ADD_NEW_FLAG(CXX NEW_FLAG "${ARGV1}")
- endif(NOT "${ARGV1}" STREQUAL "")
- if(NOT "${ARGV2}" STREQUAL "")
- foreach(flagvar ${ARGV2})
- if(${flagvar})
- set(${flagvar} "${${flagvar}} -${flag}")
- else(${flagvar})
- set(${flagvar} "-${flag}")
- endif(${flagvar})
- endforeach(flagvar ${ARGV2})
- endif(NOT "${ARGV2}" STREQUAL "")
- if(NOT "${ARGV3}" STREQUAL "")
- foreach(flagvar ${ARGV3})
- if(NOT ${flagvar})
- set(${flagvar} "-${flag}")
- endif(NOT ${flagvar})
- endforeach(flagvar ${ARGV3})
- endif(NOT "${ARGV3}" STREQUAL "")
- endif(${ARGC} LESS 2)
- endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND)
-endmacro()
+ # 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}}")
+ set(${flag_var} "${NEW_FLAG}")
+ endif(${UPPER_FLAG}_COMPILER_FLAG_FOUND AND NOT "${${flag_var}}")
+ endif(NOT ${flag_var})
+ endforeach(flag_var ${FLAG_VARS})
+ endif(${ARGC} LESS 3)
+endmacro(BRLCAD_CHECK_FLAG)
+
+# Convenience wrappers to call the primary checking function with a default
language.
+macro(BRLCAD_CHECK_C_FLAG)
+ BRLCAD_CHECK_FLAG(C ${ARGN})
+endmacro(BRLCAD_CHECK_C_FLAG)
+macro(BRLCAD_CHECK_CXX_FLAG)
+ BRLCAD_CHECK_FLAG(CXX ${ARGN})
+endmacro(BRLCAD_CHECK_CXX_FLAG)
+
# Clear out most CMake-assigned defaults - We're managing
# our own compile flags, and don't (for example) want NDEBUG
# if we have debugging flags enabled for a Release build.
@@ -235,7 +242,7 @@
# may still output SSE instructions (e.g., for cross-compiling).
# BRLCAD_CHECK_C_FLAG(msse)
# BRLCAD_CHECK_C_FLAG(msse2)
-BRLCAD_CHECK_C_FLAG(msse3 Debug)
+BRLCAD_CHECK_C_FLAG(msse3 BUILD_TYPES Debug)
# Check for c90 support with gnu extensions if we're not building for a
# release and c99 support with gnu extensions when we are building for a
@@ -249,8 +256,8 @@
# having '//' comments embedded). Do as the Autotools system did
# and use gnu99 here - c99 has problems on Linux.
# BRLCAD_CHECK_C_FLAG("std=gnu1x")
-BRLCAD_CHECK_C_FLAG("std=gnu99" Release "" C99_FLAG)
-BRLCAD_CHECK_C_FLAG("std=gnu89" Debug)
+BRLCAD_CHECK_C_FLAG("std=gnu99" BUILD_TYPES Release VARS C99_FLAG)
+BRLCAD_CHECK_C_FLAG("std=gnu89" BUILD_TYPES Debug)
# Silence check for unused arguments (used to silence clang warnings about
# unused options on the command line). By default clang generates a lot of
@@ -260,14 +267,14 @@
# 64bit compilation flags
if(${CMAKE_WORD_SIZE} MATCHES "64BIT")
- BRLCAD_CHECK_C_FLAG(m64 "" "" 64BIT_FLAG)
- BRLCAD_CHECK_C_FLAG("arch x86_64" "" "" 64BIT_FLAG)
- BRLCAD_CHECK_C_FLAG(64 "" "" 64BIT_FLAG)
- BRLCAD_CHECK_C_FLAG("mabi=64" "" "" 64BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG(m64 VARS 64BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG("arch x86_64" VARS 64BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG(64 VARS 64BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG("mabi=64" VARS 64BIT_FLAG)
if(NOT 64BIT_FLAG AND ${CMAKE_WORD_SIZE} MATCHES "64BIT")
message(FATAL_ERROR "Trying to compile 64BIT but all 64 bit compiler flag
tests failed!")
endif(NOT 64BIT_FLAG AND ${CMAKE_WORD_SIZE} MATCHES "64BIT")
- BRLCAD_CHECK_C_FLAG(q64 "" "" 64BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG(q64 VARS 64BIT_FLAG)
ADD_NEW_FLAG(C 64BIT_FLAG ALL)
ADD_NEW_FLAG(CXX 64BIT_FLAG ALL)
ADD_NEW_FLAG(SHARED_LINKER 64BIT_FLAG ALL)
@@ -276,11 +283,11 @@
# 32 bit compilation flags
if(${CMAKE_WORD_SIZE} MATCHES "32BIT" AND NOT ${BRLCAD_WORD_SIZE} MATCHES
"AUTO")
- BRLCAD_CHECK_C_FLAG(m32 "" "" 32BIT_FLAG)
- BRLCAD_CHECK_C_FLAG("arch i686" "" "" 32BIT_FLAG)
- BRLCAD_CHECK_C_FLAG(32 "" "" 32BIT_FLAG)
- BRLCAD_CHECK_C_FLAG("mabi=32" "" "" 32BIT_FLAG)
- BRLCAD_CHECK_C_FLAG(q32 32BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG(m32 VARS 32BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG("arch i686" VARS 32BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG(32 VARS 32BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG("mabi=32" VARS 32BIT_FLAG)
+ BRLCAD_CHECK_C_FLAG(q32 VARS 32BIT_FLAG)
if(NOT 32BIT_FLAG AND ${CMAKE_WORD_SIZE} MATCHES "32BIT")
message(FATAL_ERROR "Trying to compile 32BIT but all 32 bit compiler flag
tests failed!")
endif(NOT 32BIT_FLAG AND ${CMAKE_WORD_SIZE} MATCHES "32BIT")
@@ -291,9 +298,9 @@
endif(${CMAKE_WORD_SIZE} MATCHES "32BIT" AND NOT ${BRLCAD_WORD_SIZE} MATCHES
"AUTO")
if(BRLCAD_ENABLE_PROFILING)
- BRLCAD_CHECK_C_FLAG(pg "" "" PROFILE_FLAG)
- BRLCAD_CHECK_C_FLAG(p "" "" PROFILE_FLAG)
- BRLCAD_CHECK_C_FLAG(prof_gen "" "" PROFILE_FLAG)
+ BRLCAD_CHECK_C_FLAG(pg VARS PROFILE_FLAG)
+ BRLCAD_CHECK_C_FLAG(p VARS PROFILE_FLAG)
+ BRLCAD_CHECK_C_FLAG(prof_gen VARS PROFILE_FLAG)
if(NOT PROFILE_FLAG)
message("Warning - profiling requested, but don't know how to profile with
this compiler - disabling.")
set(BRLCAD_ENABLE_PROFILING OFF)
@@ -305,13 +312,13 @@
# Debugging flags
if(BRLCAD_FLAGS_DEBUG)
- BRLCAD_CHECK_C_FLAG(g "" "DEBUG_C_FLAGS")
- BRLCAD_CHECK_CXX_FLAG(g "" "DEBUG_CXX_FLAGS")
+ BRLCAD_CHECK_C_FLAG(g GROUPS DEBUG_C_FLAGS)
+ BRLCAD_CHECK_CXX_FLAG(g GROUPS DEBUG_CXX_FLAGS)
if(APPLE)
EXEC_PROGRAM(sw_vers ARGS -productVersion OUTPUT_VARIABLE MACOSX_VERSION)
if(${MACOSX_VERSION} VERSION_LESS "10.5")
- BRLCAD_CHECK_C_FLAG(ggdb3 "" "DEBUG_C_FLAGS")
- BRLCAD_CHECK_CXX_FLAG(ggdb3 "" "DEBUG_CXX_FLAGS")
+ BRLCAD_CHECK_C_FLAG(ggdb3 GROUPS DEBUG_C_FLAGS)
+ BRLCAD_CHECK_CXX_FLAG(ggdb3 GROUPS DEBUG_CXX_FLAGS)
else(${MACOSX_VERSION} VERSION_LESS "10.5")
# CHECK_C_COMPILER_FLAG silently eats gstabs+ - also, compiler
# apparently doesn't like mixing stabs with another debug flag.
@@ -319,8 +326,8 @@
set(DEBUG_CXX_FLAGS "-ggdb")
endif(${MACOSX_VERSION} VERSION_LESS "10.5")
else(APPLE)
- BRLCAD_CHECK_C_FLAG(ggdb3 "" "DEBUG_C_FLAGS")
- BRLCAD_CHECK_CXX_FLAG(ggdb3 "" "DEBUG_CXX_FLAGS")
+ BRLCAD_CHECK_C_FLAG(ggdb3 GROUPS DEBUG_C_FLAGS)
+ BRLCAD_CHECK_CXX_FLAG(ggdb3 GROUPS DEBUG_CXX_FLAGS)
endif(APPLE)
if(CMAKE_CONFIGURATION_TYPES)
set(debug_config_list "${CMAKE_CONFIGURATION_TYPES}")
@@ -345,16 +352,16 @@
endif(NOT MACOSX_DEPLOYMENT_TARGET)
if(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.3")
- BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.3 -isysroot
/Developer/SDKs/MacOSX10.3.9.sdk" "" "" SDK_FLAG)
+ BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.3 -isysroot
/Developer/SDKs/MacOSX10.3.9.sdk" VARS SDK_FLAG)
endif(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.3")
if(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.4")
- BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.4 -isysroot
/Developer/SDKs/MacOSX10.4u.sdk" "" "" SDK_FLAG)
+ BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.4 -isysroot
/Developer/SDKs/MacOSX10.4u.sdk" VARS SDK_FLAG)
endif(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.4")
if(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.5")
- BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.5 -isysroot
/Developer/SDKs/MacOSX10.5.sdk" "" "" SDK_FLAG)
+ BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.5 -isysroot
/Developer/SDKs/MacOSX10.5.sdk" VARS SDK_FLAG)
endif(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.5")
if(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.6")
- BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.6 -isysroot
/Developer/SDKs/MacOSX10.6.sdk" "" "" SDK_FLAG)
+ BRLCAD_CHECK_C_FLAG("mmacosx-version-min=10.6 -isysroot
/Developer/SDKs/MacOSX10.6.sdk" VARS SDK_FLAG)
endif(MACOSX_DEPLOYMENT_TARGET STREQUAL "10.6")
ADD_NEW_FLAG(C SDK_FLAG ALL)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
