Changeset 5695 for code/trunk/cmake

Timestamp:

Aug 30, 2009, 2:22:00 AM (15 years ago)

Author:

rgrieder

Message:

Merged resource2 branch back to trunk.

IMPORTANT NOTE:
Upon this merge you need to specifically call your data directory "data_extern" when checking it out (when you don't provide a name, it will be just called 'trunk').
The new CMake variable is EXTERNAL_DATA_DIRECTORY. DATA_DIRECTORY now points to the one the source part of the repository.
UPDATE YOUR DATA DIRECTORY AS WELL!!!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• cmake/BuildConfig.cmake (deleted)
• cmake/BuildConfigGCC.cmake (deleted)
• cmake/BuildConfigMSVC.cmake (deleted)
• cmake/CheckOGREPlugins.cmake (modified) (1 diff)
• cmake/CompilerConfig.cmake (copied) (copied from code/branches/resource2/cmake/CompilerConfig.cmake)
• cmake/CompilerConfigGCC.cmake (copied) (copied from code/branches/resource2/cmake/CompilerConfigGCC.cmake)
• cmake/CompilerConfigMSVC.cmake (copied) (copied from code/branches/resource2/cmake/CompilerConfigMSVC.cmake)
• cmake/GenerateToluaBindings.cmake (modified) (2 diffs)
• cmake/InstallConfig.cmake (copied) (copied from code/branches/resource2/cmake/InstallConfig.cmake) (3 diffs)
• cmake/LibraryConfig.cmake (modified) (4 diffs)
• cmake/Media.cmake (deleted)
• cmake/PackageConfig.cmake (modified) (2 diffs)
• cmake/PackageConfigMSVC.cmake (modified) (1 diff)
• cmake/PackageConfigMinGW.cmake (modified) (1 diff)
• cmake/ParseMacroArguments.cmake (modified) (2 diffs)
• cmake/TargetUtilities.cmake (modified) (7 diffs)

code/trunk/cmake/CheckOGREPlugins.cmake

@@ -32 +32 @@
  #    OGRE_PLUGINS_RELEASE        Names of the release plugins without ext.
  #  Note:
- #    You must not specify render systems as input, but the ones found will be
- #    present in the output variables.
+ #    You must not specify render systems as input. That will be taken care of
+ #    automatically.
  #
 

code/trunk/cmake/GenerateToluaBindings.cmake

@@ -30 +30 @@
  #    TOLUA_PARSER_SOURCE - Lua file with the parser source code
  #    TOLUA_PARSER_DEPENDENCIES - All the dependent lua files
- #    ORXONOX_RUNTIME_LIBRARY_DIRECTORY - Working directory
+ #    RUNTIME_LIBRARY_DIRECTORY - Working directory
  #
 
@@ -74 +74 @@
     DEPENDS           ${TOLUA_PARSER_DEPENDENCIES}
     IMPLICIT_DEPENDS  ${_implicit_dependencies}
-    WORKING_DIRECTORY ${ORXONOX_RUNTIME_LIBRARY_DIRECTORY}
+    WORKING_DIRECTORY ${RUNTIME_LIBRARY_DIRECTORY}
     COMMENT "Generating tolua bind files for package ${_tolua_package}"
   )

code/trunk/cmake/InstallConfig.cmake

@@ -43 +43 @@
 SET(LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_LIBRARY_PATH})
 SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/${DEFAULT_ARCHIVE_PATH})
+SET(MODULE_INSTALL_DIRECTORY  ${CMAKE_INSTALL_PREFIX}/${DEFAULT_MODULE_PATH})
 SET(DOC_INSTALL_DIRECTORY     ${CMAKE_INSTALL_PREFIX}/${DEFAULT_DOC_PATH})
 SET(DATA_INSTALL_DIRECTORY    ${CMAKE_INSTALL_PREFIX}/${DEFAULT_DATA_PATH})
@@ -54 +55 @@
     SET(LIBRARY_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/orxonox)
     SET(ARCHIVE_INSTALL_DIRECTORY ${CMAKE_INSTALL_PREFIX}/lib/orxonox/static)
+    SET(MODULE_INSTALL_DIRECTORY  ${CMAKE_INSTALL_PREFIX}/lib/orxonox/modules)
     SET(DOC_INSTALL_DIRECTORY     ${CMAKE_INSTALL_PREFIX}/share/doc/orxonox)
     SET(DATA_INSTALL_DIRECTORY    ${CMAKE_INSTALL_PREFIX}/share/orxonox)
@@ -67 +69 @@
 # When building, don't use the install RPATH already
 # (but later on when installing)
-SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
+SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
 
 # The RPATH to be used when installing

code/trunk/cmake/LibraryConfig.cmake

@@ -31 +31 @@
 # Prevent CMake from finding libraries in the installation folder on Windows.
 # There might already be an installation from another compiler
-IF(DEPENDENCY_PACKAGE_ENABLE)
+IF(WIN32)
   LIST(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH  "${CMAKE_INSTALL_PREFIX}")
   LIST(REMOVE_ITEM CMAKE_SYSTEM_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/bin")
@@ -72 +72 @@
 
 # User script
-SET(USER_SCRIPT_LIBRARY_CONFIG "" CACHE FILEPATH
+SET(LIBRARY_CONFIG_USER_SCRIPT "" CACHE FILEPATH
     "Specify a CMake script if you wish to write your own library path config.
-     See LibraryConfigTardis.cmake or LibraryConfigMinGW.cmake for examples.")
-IF(USER_SCRIPT_LIBRARY_CONFIG)
-  IF(EXISTS ${CMAKE_MODULE_PATH}/${USER_SCRIPT_LIBRARY_CONFIG}.cmake)
-    INCLUDE(${USER_SCRIPT_LIBRARY_CONFIG})
-  ELSEIF(EXISTS ${USER_SCRIPT_LIBRARY_CONFIG})
-    INCLUDE(${USER_SCRIPT_LIBRARY_CONFIG})
-  ELSEIF(EXISTS ${CMAKE_MODULE_PATH}/${USER_SCRIPT_LIBRARY_CONFIG})
-    INCLUDE(${CMAKE_MODULE_PATH}/${USER_SCRIPT_LIBRARY_CONFIG})
-  ENDIF()
-ENDIF(USER_SCRIPT_LIBRARY_CONFIG)
+     See LibraryConfigTardis.cmake for an example.")
+IF(LIBRARY_CONFIG_USER_SCRIPT)
+  IF(EXISTS ${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
+    INCLUDE(${CMAKE_MODULE_PATH}/${LIBRARY_CONFIG_USER_SCRIPT})
+  ENDIF()
+ENDIF(LIBRARY_CONFIG_USER_SCRIPT)
 
 
@@ -89 +85 @@
 # Performs the search and sets the variables    #
 
-FIND_PACKAGE(OGRE  1.4 EXACT REQUIRED)
+FIND_PACKAGE(OGRE  1.4       REQUIRED)
 FIND_PACKAGE(ENet  1.1       REQUIRED)
 FIND_PACKAGE(Ogg             REQUIRED)
@@ -185 +181 @@
   ENDIF()
 ENDIF(WIN32)
+
+
+################# OGRE Plugins ##################
+
+# More plugins: Plugin_BSPSceneManager, Plugin_OctreeSceneManager
+SET(OGRE_PLUGINS_INT Plugin_ParticleFX)
+IF(WIN32)
+  # CG program manager is probably DirectX related (not available under unix)
+  LIST(APPEND OGRE_PLUGINS_INT Plugin_CgProgramManager)
+ENDIF(WIN32)
+SET(OGRE_PLUGINS ${OGRE_PLUGINS_INT} CACHE STRING
+   "Specify which OGRE plugins to load. Existance check is performed.")
+
+# Check the plugins and determine the plugin folder
+# You can give a hint by setting the environment variable ENV{OGRE_PLUGIN_DIR}
+INCLUDE(CheckOGREPlugins)
+CHECK_OGRE_PLUGINS(${OGRE_PLUGINS})
+

code/trunk/cmake/PackageConfig.cmake

@@ -1 @@
-# General package configuration. Merely sets the include paths.
-# Library files are treated separately.
+ #
+ #             ORXONOX - the hottest 3D action shooter ever to exist
+ #                             > www.orxonox.net <
+ #
+ #        This program is free software; you can redistribute it and/or
+ #         modify it under the terms of the GNU General Public License
+ #        as published by the Free Software Foundation; either version 2
+ #            of the License, or (at your option) any later version.
+ #
+ #       This program is distributed in the hope that it will be useful,
+ #        but WITHOUT ANY WARRANTY; without even the implied warranty of
+ #        MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ #                 GNU General Public License for more details.
+ #
+ #   You should have received a copy of the GNU General Public License along
+ #      with this program; if not, write to the Free Software Foundation,
+ #     Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ #
+ #
+ #  Author:
+ #    Reto Grieder
+ #  Description:
+ #    General package configuration. Merely sets the include paths.
+ #    Library files are treated separately.
+ #
 
 # Check package version info
@@ -28 +51 @@
 ENDIF()
 
-MESSAGE(STATUS "Using library package for the dependencies.")
+IF(NOT _INTERNAL_PACKAGE_MESSAGE)
+  MESSAGE(STATUS "Using library package for the dependencies.")
+  SET(_INTERNAL_PACKAGE_MESSAGE 1 CACHE INTERNAL "Do not edit!" FORCE)
+ENDIF()
 
 # Include paths and other special treatments

code/trunk/cmake/PackageConfigMSVC.cmake

@@ -47 +47 @@
 
   # Also the directory with the runtime libraries
-  SET(ORXONOX_RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
+  SET(RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
 
   # Sets the library path for the FIND_LIBRARY

code/trunk/cmake/PackageConfigMinGW.cmake

@@ -40 +40 @@
 
   # Also the directory with the runtime libraries
-  SET(ORXONOX_RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
+  SET(RUNTIME_LIBRARY_DIRECTORY ${DEP_BINARY_DIR})
 
   # Sets the library path for the FIND_LIBRARY

code/trunk/cmake/ParseMacroArguments.cmake

@@ -36 +36 @@
 
 MACRO(PARSE_MACRO_ARGUMENTS _switches _list_names)
+
+  # Using LIST(FIND ...) speeds up the process
+  SET(_keywords ${_switches} ${_list_names})
+
   # Parse all the arguments and set the corresponding variable
   # If the option is just a switch, set the variable to its name for later use
   FOREACH(_arg ${ARGN})
-    SET(_arg_found FALSE)
 
-    # Switches
-    FOREACH(_switch ${_switches})
-      IF(${_switch} STREQUAL ${_arg})
-        SET(_arg_${_switch} ${_switch})
-        SET(_arg_found TRUE)
-        # Avoid interpreting arguments after this one as options args for the previous one
-        SET(_storage_var)
-        BREAK()
-      ENDIF()
-    ENDFOREACH(_switch)
+    # Is the argument a keyword?
+    LIST(FIND _keywords ${_arg} _keyword_index)
+    IF(NOT _keyword_index EQUAL -1)
 
-    # Input options
-    IF(NOT _arg_found)
-      FOREACH(_list_name ${_list_names})
-        IF(${_list_name} STREQUAL ${_arg})
-          SET(_storage_var _arg_${_list_name})
-          SET(_arg_found TRUE)
+      # Another optimisation
+      SET(_arg_found FALSE)
+      # Switches
+      FOREACH(_switch ${_switches})
+        IF(${_switch} STREQUAL ${_arg})
+          SET(_arg_${_switch} ${_switch})
+          SET(_arg_found TRUE)
+          # Avoid interpreting arguments after this one as options args for the previous one
+          SET(_storage_var)
           BREAK()
         ENDIF()
-      ENDFOREACH(_list_name)
-    ENDIF(NOT _arg_found)
+      ENDFOREACH(_switch)
 
-    # Arguments of an input option (like source files for SOURCE_FILES)
-    IF(NOT _arg_found)
+      # Input options
+      IF(NOT _arg_found)
+        FOREACH(_list_name ${_list_names})
+          IF(${_list_name} STREQUAL ${_arg})
+            SET(_storage_var _arg_${_list_name})
+            BREAK()
+          ENDIF()
+        ENDFOREACH(_list_name)
+      ENDIF(NOT _arg_found)
+
+    ELSE()
+
+      # Arguments of an input option (like source files for SOURCE_FILES)
       IF(_storage_var)
         # Store in variable define above in the foreach loop
@@ -71 +80 @@
         MESSAGE(FATAL_ERROR "ORXONOX_ADD_${_target_type} was given a non compliant argument: ${_arg}")
       ENDIF(_storage_var)
-    ENDIF(NOT _arg_found)
+
+    ENDIF()
 
   ENDFOREACH(_arg)

code/trunk/cmake/TargetUtilities.cmake

@@ -58 +58 @@
  #
 
+INCLUDE(CMakeDependentOption)
 INCLUDE(CapitaliseName)
 INCLUDE(GenerateToluaBindings)
@@ -118 +119 @@
 
   # First part (pre target) of precompiled header files
-  IF(PCH_COMPILER_SUPPORT AND PCH_ENABLE AND _arg_PCH_FILE)
+  IF(PCH_COMPILER_SUPPORT AND _arg_PCH_FILE)
     # Provide convenient option to control PCH
     STRING(TOUPPER "${_target_name}" _target_name_upper)
@@ -126 +127 @@
       SET(PCH_DEFAULT TRUE)
     ENDIF()
-    OPTION(PCH_ENABLE_${_target_name_upper} "Enable using precompiled header files for library ${_target_name}." ${PCH_DEFAULT})
+    CMAKE_DEPENDENT_OPTION(PCH_ENABLE_${_target_name_upper}
+      "Enable using precompiled header files for library ${_target_name}." ${PCH_DEFAULT} PCH_ENABLE OFF)
 
     IF(PCH_ENABLE_${_target_name_upper})
@@ -203 +205 @@
     IF(_arg_MODULE)
       INSTALL(TARGETS ${_target_name}
-        RUNTIME DESTINATION ${ORXONOX_MODULE_INSTALL_PATH}
-        LIBRARY DESTINATION ${ORXONOX_MODULE_INSTALL_PATH}
+        RUNTIME DESTINATION ${MODULE_INSTALL_DIRECTORY}
+        LIBRARY DESTINATION ${MODULE_INSTALL_DIRECTORY}
       )
     ELSE()
       INSTALL(TARGETS ${_target_name}
-        RUNTIME DESTINATION ${ORXONOX_RUNTIME_INSTALL_PATH}
-        LIBRARY DESTINATION ${ORXONOX_LIBRARY_INSTALL_PATH}
+        RUNTIME DESTINATION ${RUNTIME_INSTALL_DIRECTORY}
+        LIBRARY DESTINATION ${LIBRARY_INSTALL_DIRECTORY}
       )
     ENDIF()
@@ -217 +219 @@
 
 
-# Creates a helper file with name <name_of_the_library>.module
+# Creates a helper file with name <name_of_the_library>${ORXONOX_MODULE_EXTENSION}
 # This helps finding dynamically loadable modules at runtime
 
@@ -235 +237 @@
       INSTALL(
         FILES ${_module_filename}
-        DESTINATION ${ORXONOX_MODULE_INSTALL_PATH}
+        DESTINATION ${MODULE_INSTALL_DIRECTORY}
         CONFIGURATIONS ${_config}
       )
@@ -246 +248 @@
     INSTALL(
       FILES ${_module_filename}
-      DESTINATION ${ORXONOX_MODULE_INSTALL_PATH}
+      DESTINATION ${MODULE_INSTALL_DIRECTORY}
     )
   ENDIF()