[Orxonox-commit 3357] r8045 - code/branches/mac_osx/src

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2011-03-08 06:27:31 +0100 (Tue, 08 Mar 2011)
New Revision: 8045

Modified:
   code/branches/mac_osx/src/OrxonoxConfig.cmake
   code/branches/mac_osx/src/OrxonoxConfig.h.in
Log:
Simplified a workaround.

Modified: code/branches/mac_osx/src/OrxonoxConfig.cmake
===================================================================
--- code/branches/mac_osx/src/OrxonoxConfig.cmake	2011-03-08 05:27:07 UTC (rev 8044)
+++ code/branches/mac_osx/src/OrxonoxConfig.cmake	2011-03-08 05:27:31 UTC (rev 8045)
@@ -68,17 +68,13 @@
   CHECK_CXX_SOURCE_COMPILES("${_source}" HAVE_FORCEINLINE)
 ENDIF(MSVC)
 
-# Part of a woraround for OS X warnings. See OrxonoxConfig.h.in
-IF(HAVE_STDINT_H)
-  SET(HAVE_STDINT_H 1)
-ELSE()
-  SET(HAVE_STDINT_H 0)
-ENDIF()
-
 # Check iso646.h include (literal operators)
 INCLUDE(CheckIncludeFileCXX)
 CHECK_INCLUDE_FILE_CXX(iso646.h HAVE_ISO646_H)
 
+# Part of a woraround for OS X warnings. See OrxonoxConfig.h.in
+SET(ORX_HAVE_STD_INT HAVE_STDINT_H)
+
 ############## Configured Headers ###############
 
 SET(GENERATED_FILE_COMMENT

Modified: code/branches/mac_osx/src/OrxonoxConfig.h.in
===================================================================
--- code/branches/mac_osx/src/OrxonoxConfig.h.in	2011-03-08 05:27:07 UTC (rev 8044)
+++ code/branches/mac_osx/src/OrxonoxConfig.h.in	2011-03-08 05:27:31 UTC (rev 8045)
@@ -161,9 +161,10 @@
 #endif
 
 // On OS X some headers already define HAVE_STDINT_H and that spits out
-// some warnings. Therefore we use this syntax.
+// some warnings. Therefore we use this macro.
 // Note: This requires some extra code in OrxonoxConfig.cmake
-#if @HAVE_STDINT_H@
+#cmakedefine ORX_HAVE_STDINT_H
+#ifdef ORX_HAVE_STDINT_H
 #  include <stdint.h>
 #elif defined(ORXONOX_COMPILER_MSVC)
 typedef __int8            int8_t;