[brlcad-commits] SF.net SVN: brlcad:[45993] brlcad/trunk/misc/CMake/CompilerFlags.cmake

[<sta...@us...>]

Revision: 45993
          http://brlcad.svn.sourceforge.net/brlcad/?rev=45993&view=rev
Author:   starseeker
Date:     2011-08-15 22:08:57 +0000 (Mon, 15 Aug 2011)

Log Message:
-----------
Don't try adding the debug flag manually if it's Xcode - let Xcode itself handle things.  Trying it manually caused an options conflict.

Modified Paths:
--------------
    brlcad/trunk/misc/CMake/CompilerFlags.cmake

Modified: brlcad/trunk/misc/CMake/CompilerFlags.cmake
===================================================================
--- brlcad/trunk/misc/CMake/CompilerFlags.cmake	2011-08-15 19:12:36 UTC (rev 45992)
+++ brlcad/trunk/misc/CMake/CompilerFlags.cmake	2011-08-15 22:08:57 UTC (rev 45993)
@@ -197,13 +197,15 @@
 # Debugging flags
 IF(${BRLCAD_DEBUG_BUILD} STREQUAL "ON")
 	IF(APPLE)
-		EXEC_PROGRAM(sw_vers ARGS -productVersion OUTPUT_VARIABLE MACOSX_VERSION)
-		IF(${MACOSX_VERSION} VERSION_LESS "10.5")
-			CHECK_C_FLAG_GATHER(ggdb3 DEBUG_FLAG)
-		ELSE(${MACOSX_VERSION} VERSION_LESS "10.5")
-			#CHECK_C_COMPILER_FLAG silently eats gstabs+
-			SET(DEBUG_FLAG "${DEBUG_FLAG} -gstabs+")
-		ENDIF(${MACOSX_VERSION} VERSION_LESS "10.5")
+		IF(NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
+			EXEC_PROGRAM(sw_vers ARGS -productVersion OUTPUT_VARIABLE MACOSX_VERSION)
+			IF(${MACOSX_VERSION} VERSION_LESS "10.5")
+				CHECK_C_FLAG_GATHER(ggdb3 DEBUG_FLAG)
+			ELSE(${MACOSX_VERSION} VERSION_LESS "10.5")
+				#CHECK_C_COMPILER_FLAG silently eats gstabs+
+				SET(DEBUG_FLAG "${DEBUG_FLAG} -gstabs+")
+			ENDIF(${MACOSX_VERSION} VERSION_LESS "10.5")
+		ENDIF(NOT "${CMAKE_GENERATOR}" STREQUAL "Xcode")
 	ELSE(APPLE)
 		CHECK_C_FLAG_GATHER(ggdb3 DEBUG_FLAG)
 	ENDIF(APPLE)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.