Changeset 2579 for code/branches/buildsystem2/cmake/FindCEGUI.cmake

Timestamp:

Jan 8, 2009, 9:37:41 PM (15 years ago)

Author:

rgrieder

Message:

• Equipped find scripts with debug/optimized functions. If you have different debug prefixes on your platform simply change ${LIBRARY_DEBUG_POSTFIX} ("_d" default).
• Clean up in ConfigMSVC.cmake and ConfigMinGW.cmake
• Also had a good look at the MinGW libraries according to the libs_1889_mingw.zip (no warranty at all, hope I got them all)
• INSTALL commands are currently limited to non Windows platforms (don't yet know why it doesn't work)

File:

• code/branches/buildsystem2/cmake/FindCEGUI.cmake (modified) (2 diffs)

code/branches/buildsystem2/cmake/FindCEGUI.cmake

@@ -26 +26 @@
     PATH_SUFFIXES include include/CEGUI
 )
-
-IF(WIN32)
-    FIND_LIBRARY(CEGUI_LIBRARY_
-        NAMES CEGUIBase
-        PATHS
-        $ENV{CEGUIDIR}
-        PATH_SUFFIXES lib
-    )
-    FIND_LIBRARY(CEGUI_LIBRARY_d
-        NAMES CEGUIBase_d
-        PATHS
-        $ENV{CEGUIDIR}
-        PATH_SUFFIXES lib
-    )
-    IF(CEGUI_LIBRARY_)
-        IF(CEGUI_LIBRARY_d)
-            SET(CEGUI_LIBRARY optimized ${CEGUI_LIBRARY_} debug ${CEGUI_LIBRARY_d})
-        ELSE(CEGUI_LIBRARY_d)
-            SET(CEGUI_LIBRARY ${CEGUI_LIBRARY_})
-        ENDIF(CEGUI_LIBRARY_d)
-    ENDIF(CEGUI_LIBRARY_)
-ELSE(WIN32)
-    FIND_LIBRARY(CEGUI_LIBRARY
-        NAMES CEGUIBase
-        PATHS
-        $ENV{CEGUIDIR}
-        /usr/local
-        /usr
-        PATH_SUFFIXES lib
-    )
-ENDIF(WIN32)
+FIND_LIBRARY(CEGUI_LIBRARY_OPTIMIZED
+    NAMES CEGUIBase
+    PATHS
+    $ENV{CEGUIDIR}
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib
+)
+FIND_LIBRARY(CEGUI_LIBRARY_DEBUG
+    NAMES CEGUIBase_${LIBRARY_DEBUG_POSTFIX}
+    PATHS
+    $ENV{CEGUIDIR}
+    /usr/local
+    /usr
+    PATH_SUFFIXES lib
+)
 
 # Look in CEGUIVersion.h for the version number
@@ -85 +70 @@
 #    ENDIF (NOT CEGUI_SCRIPT_LIBDIR)
 
-INCLUDE(FindPackageHandleStandardArgs)
+
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(CEGUI DEFAULT_MSG
-    CEGUI_LIBRARY
+    CEGUI_LIBRARY_OPTIMIZED
     CEGUI_INCLUDE_DIR
     #CEGUI_SCRIPT_LIBRARIES
 )
 
+# Set optimized and debug libraries
+HandleLibraryTypes(CEGUI)
+
 MARK_AS_ADVANCED(
     CEGUI_LIBRARY
-    CEGUI_LIBRARY_
-    CEGUI_LIBRARY_d
+    CEGUI_LIBRARY_OPTIMIZED
+    CEGUI_LIBRARY_DEBUG
     CEGUI_INCLUDE_DIR
-    CEGUI_VERSION
     #CEGUI_SCRIPT_LIBRARIES
 )