Changeset 7356

Timestamp:

Sep 5, 2010, 5:31:56 PM (14 years ago)

Author:

rgrieder

Message:

This should take care of most of the conditional compilation for Doxygen. Mind that the API reference is now dependent on the machine Doxygen runs. Previously there was just a mixture (i.e. any #ifdef evaluated false and therefore the #else block (if available) was chosen).

Location:

code/branches/doc/doc/api

Files:

• CMakeLists.txt (modified) (1 diff)
• doxy.config.in (modified) (3 diffs)

code/branches/doc/doc/api/CMakeLists.txt

@@ -64 +64 @@
   ENDIF()
 
+  # Take care of most of the conditional compilation problems
+  # (Doxygen requires separate input for that)
+  IF(WIN32)
+    SET(DOXY_PLATFORM_DEF "ORXONOX_PLATFORM_WINDOWS")
+  ELSEIF(APPLE)
+    SET(DOXY_PLATFORM_DEF "ORXONOX_PLATFORM_APPLE ORXONOX_PLATFORM_UNIX")
+  ELSE()
+    SET(DOXY_PLATFORM_DEF "ORXONOX_PLATFORM_LINUX ORXONOX_PLATFORM_UNIX")
+  ENDIF()
+  IF(MSVC)
+    SET(DOXY_COMPILER_DEF "ORXONOX_COMPILER_MSVC")
+  ELSE()
+    SET(DOXY_COMPILER_DEF "ORXONOX_COMPILER_GCC")
+  ENDIF()
+
   IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doxy.config.in)
     # use (configured) doxy.config from (out of place) BUILD tree:

code/branches/doc/doc/api/doxy.config.in

@@ -1292 +1292 @@
 # way by setting EXPAND_ONLY_PREDEF to YES.
 
-MACRO_EXPANSION        = YES
+MACRO_EXPANSION        = NO
 
 # If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
@@ -1309 +1309 @@
 # the preprocessor.
 
-INCLUDE_PATH           =
+INCLUDE_PATH           = #@DOXYGEN_INCLUDE_DIRECTORIES@
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
@@ -1326 +1326 @@
 # instead of the = operator.
 
-PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS
+PREDEFINED             = DOXYGEN_SHOULD_SKIP_THIS \
+                         @DOXY_PLATFORM_DEF@ \
+                         @DOXY_COMPILER_DEF@
 
 # If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then