Changeset 2670 for code/branches/buildsystem3/doc

Timestamp:

Feb 15, 2009, 7:53:22 PM (16 years ago)

Author:

rgrieder

Message:

• Added version info (written by the linker) to all libraries
• Target dependency bugfix for msvc in doc/api
• Fixed possibly non existent html directory when installing docs
• Merged the three Bullet libraries into a single one
• No warnings at all from third party libraries
• Performance tweak in ceguilua CMake files

File:

• code/branches/buildsystem3/doc/api/CMakeLists.txt (modified) (2 diffs)

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

@@ -65 +65 @@
       STRING(REGEX REPLACE "/" "\\\\" HHP_FILE ${TMP})
       ADD_CUSTOM_TARGET(chmdoc ${HTML_HELP_COMPILER} ${HHP_FILE})
-      IF(NOT MSVC)
-        ADD_DEPENDENCIES(chmdoc doc)
-      ELSE(NOT MSVC)
-        # Do not add the dependency because msvc will then always build
-        # Doxygen, which is not very comforting.
-      ENDIF(NOT MSVC)
+      ADD_DEPENDENCIES(chmdoc doc)
+      # Adding a dependency somehow adds doc target as default build target
+      SET_TARGET_PROPERTIES(doc chmdoc PROPERTIES EXCLUDE_FROM_DEFAULT_BUILD TRUE)
     ENDIF(HTML_HELP_COMPILER)
   ENDIF (WIN32) 
@@ -81 +78 @@
     OPTIONAL
   )
-  IF(EXISTS ${CMAAKE_CURRENT_BINARY_DIR}/html)
-    INSTALL(
-      DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
-      DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
-    )
+  # Install command always needs the directory to work
+  IF(NOT EXISTS ${CMAKE_CURRENT_BINARY_DIR}/html)
+    FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html)
   ENDIF()
+  INSTALL(
+    DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html
+    DESTINATION ${ORXONOX_DOC_INSTALL_PATH}/api
+  )
 ENDIF(DOXYGEN_FOUND)