Changeset 2628

Timestamp:

Feb 1, 2009, 1:18:03 AM (16 years ago)

Author:

rgrieder

Message:

Small fixes:

• CheckOGREPlugins wasn't handling debug libraries correctly
• OpenAL was missig the "Found OpenAL" message
• changed all find scripts to show the library in the output instead of the include directory
• Run script gets overridden by force
• Also copy run script to the bin folder

Location:

code/branches/buildsystem2

Files:

• bin-config/CMakeLists.txt (modified) (1 diff)
• cmake/CheckOGREPlugins.cmake (modified) (3 diffs)
• cmake/FindALUT.cmake (modified) (1 diff)
• cmake/FindCEGUI.cmake (modified) (1 diff)
• cmake/FindDirectX.cmake (modified) (1 diff)
• cmake/FindENet.cmake (modified) (1 diff)
• cmake/FindLua.cmake (modified) (1 diff)
• cmake/FindOGRE.cmake (modified) (1 diff)
• cmake/FindOgg.cmake (modified) (1 diff)
• cmake/LibraryConfig.cmake (modified) (2 diffs)

code/branches/buildsystem2/bin-config/CMakeLists.txt

@@ -104 +104 @@
     SET(RUN_SCRIPT run)
   ENDIF(WIN32)
-  IF(NOT EXISTS ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT})
-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT} @ONLY)
-  ENDIF()
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_SOURCE_DIR}/${RUN_SCRIPT} @ONLY)
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${RUN_SCRIPT} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${RUN_SCRIPT} @ONLY)
 ENDIF(NOT CMAKE_CONFIGURATION_TYPES)

code/branches/buildsystem2/cmake/CheckOGREPlugins.cmake

@@ -49 +49 @@
       NAMES ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES lib lib/OGRE bin bin/Release bin/release Release release
+      PATH_SUFFIXES bin/Release bin/release Release release lib lib/OGRE bin
     )
     FIND_LIBRARY(OGRE_PLUGIN_${_plugin}_DEBUG
-      NAMES ${_plugin}d ${_plugin}_d
+      NAMES ${_plugin}d ${_plugin}_d ${_plugin}
       PATHS $ENV{OGRE_HOME} $ENV{OGRE_PLUGIN_DIR}
-      PATH_SUFFIXES lib lib/OGRE bin bin/Debug bin/debug Debug debug
+      PATH_SUFFIXES bin/Debug bin/debug Debug debug lib lib/OGRE bin
     )
     # We only need at least one render system. Check at the end.
@@ -67 +67 @@
     IF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)
       # If debug version is not available, release will do as well
-      IF(NOT OGRE_PLUGIN_${_plugin}_DEBUG)
-        SET(OGRE_PLUGIN_${_plugin}_DEBUG ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} CACHE STRING "" FORCE)
+      IF(OGRE_PLUGIN_${_plugin}_DEBUG STREQUAL OGRE_PLUGIN_${_plugin}_OPTIMIZED)
+        # In this case the library finder didn't find real debug versions
+        SET(OGRE_PLUGIN_${_plugin}_DEBUG "OGRE_PLUGIN_${_plugin}_DEBUG-NOTFOUND" CACHE STRING "" FORCE)
       ENDIF()
       MARK_AS_ADVANCED(OGRE_PLUGIN_${_plugin}_OPTIMIZED OGRE_PLUGIN_${_plugin}_DEBUG)
@@ -74 +75 @@
       ### Set variables to configure orxonox.ini correctly afterwards in bin/ ###
       # Check and set the folders
-      GET_FILENAME_COMPONENT(_release_folder ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} PATH)
-      IF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _release_folder)
+      GET_FILENAME_COMPONENT(_plugins_folder ${OGRE_PLUGIN_${_plugin}_OPTIMIZED} PATH)
+      IF(OGRE_PLUGINS_FOLDER_RELEASE AND NOT OGRE_PLUGINS_FOLDER_RELEASE STREQUAL _plugins_folder)
         MESSAGE(FATAL_ERROR "Ogre release plugins have to be in the same folder!")
       ENDIF()
-      SET(OGRE_PLUGINS_FOLDER_RELEASE ${_release_folder})
-      GET_FILENAME_COMPONENT(_debug_folder ${OGRE_PLUGIN_${_plugin}_DEBUG} PATH)
-      IF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _debug_folder)
+      SET(OGRE_PLUGINS_FOLDER_RELEASE ${_plugins_folder})
+      IF(OGRE_PLUGIN_${_plugin}_DEBUG)
+        GET_FILENAME_COMPONENT(_plugins_folder ${OGRE_PLUGIN_${_plugin}_DEBUG} PATH)
+      ENDIF()
+      IF(OGRE_PLUGINS_FOLDER_DEBUG AND NOT OGRE_PLUGINS_FOLDER_DEBUG STREQUAL _plugins_folder)
         MESSAGE(FATAL_ERROR "Ogre debug plugins have to be in the same folder!")
       ENDIF()
-      SET(OGRE_PLUGINS_FOLDER_DEBUG ${_debug_folder})
+      SET(OGRE_PLUGINS_FOLDER_DEBUG ${_plugins_folder})
 
-      # Create a list with the plugins for relase and debug configurations
+      # Create a list with the plugins for release and debug configurations
       LIST(APPEND OGRE_PLUGINS_RELEASE ${_plugin})
-      IF(OGRE_PLUGIN_${_plugin}_DEBUG)
-        # Determine debug postfix ("d" or "_d")
-        IF(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
-          LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}_d")
-        ELSE()
-          LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}d")
-        ENDIF()
+      # Determine debug postfix ("d" or "_d" or none)
+      IF(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "_d\\.|_d$")
+        LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}_d")
+      ELSEIF(OGRE_PLUGIN_${_plugin}_DEBUG MATCHES "d\\.|d$")
+        LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}d")
       ELSE()
-        LIST(APPEND OGRE_PLUGINS_DEBUG ${_plugin})
+        LIST(APPEND OGRE_PLUGINS_DEBUG "${_plugin}")
       ENDIF()
     ENDIF(OGRE_PLUGIN_${_plugin}_OPTIMIZED)

code/branches/buildsystem2/cmake/FindALUT.cmake

@@ -67 +67 @@
 # Handle the REQUIRED argument and set ALUT_FOUND
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ALUT DEFAULT_MSG
+    ALUT_LIBRARY_OPTIMIZED
     ALUT_INCLUDE_DIR
-    ALUT_LIBRARY_OPTIMIZED
 )
 

code/branches/buildsystem2/cmake/FindCEGUI.cmake

@@ -54 +54 @@
 # Also checks the version requirements if given
 FIND_PACKAGE_HANDLE_ADVANCED_ARGS(CEGUI DEFAULT_MSG "${CEGUI_VERSION}"
+  CEGUI_LIBRARY_OPTIMIZED
   CEGUI_INCLUDE_DIR
-  CEGUI_LIBRARY_OPTIMIZED
 )
 

code/branches/buildsystem2/cmake/FindDirectX.cmake

@@ -40 +40 @@
 # Handle the REQUIRED argument and set DIRECTX_FOUND
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(DirectX DEFAULT_MSG
-  DIRECTX_INCLUDE_DIR
   DIRECTX_LIBRARY_input
   DIRECTX_LIBRARY_guid
+  DIRECTX_INCLUDE_DIR
 )
 

code/branches/buildsystem2/cmake/FindENet.cmake

@@ -53 +53 @@
 # Also check the the version requirements
 FIND_PACKAGE_HANDLE_ADVANCED_ARGS(ENet DEFAULT_MSG ${ENET_VERSION}
+  ENET_LIBRARY_OPTIMIZED
   ENET_INCLUDE_DIR
-  ENET_LIBRARY_OPTIMIZED
 )
 

code/branches/buildsystem2/cmake/FindLua.cmake

@@ -156 +156 @@
 
 FIND_PACKAGE_HANDLE_ADVANCED_ARGS(Lua DEFAULT_MSG "${LUA_VERSION_LONG}"
+  LUA_LIBRARIES
   LUA_INCLUDE_DIR
-  LUA_LIBRARIES
 )
 

code/branches/buildsystem2/cmake/FindOGRE.cmake

@@ -42 +42 @@
 # Also check the version requirements
 FIND_PACKAGE_HANDLE_ADVANCED_ARGS(OGRE DEFAULT_MSG ${OGRE_VERSION}
+  OGRE_LIBRARY_OPTIMIZED
   OGRE_INCLUDE_DIR
-  OGRE_LIBRARY_OPTIMIZED
 )
 

code/branches/buildsystem2/cmake/FindOgg.cmake

@@ -38 +38 @@
 # Handle the REQUIRED argument and set OGG_FOUND
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(Ogg DEFAULT_MSG
+  OGG_LIBRARY_OPTIMIZED
   OGG_INCLUDE_DIR
-  OGG_LIBRARY_OPTIMIZED
 )
 

code/branches/buildsystem2/cmake/LibraryConfig.cmake

@@ -115 +115 @@
   ENDIF()
 ENDIF()
+# Notfiy user
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(OpenAL DEFAULT_MSG OPENAL_LIBRARY OPENAL_INCLUDE_DIR)
 # Hide variables created by the script
-MARK_AS_ADVANCED(
-  OPENAL_INCLUDE_DIR
-  OPENAL_LIBRARY
-)
+MARK_AS_ADVANCED(OPENAL_INCLUDE_DIR OPENAL_LIBRARY)
 
 ##### TCL #####
@@ -129 +128 @@
 SET(TCL_FIND_QUIETLY FALSE)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH)
-# Workaround a CMake bug that doesn't set the variables to the cache
-# Occurs at least on CMake 2.6.2 and 2.6.0 under Windows
-SET(TCL_LIBRARY ${TCL_LIBRARY} CACHE FILEPATH "")
-SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH} CACHE PATH "")
 
 ##### Boost #####