Changeset 8070 for code/branches/mac_osx/cmake

Timestamp:

Mar 13, 2011, 11:30:29 PM (14 years ago)

Author:

rgrieder

Message:

Fixed OIS v1.3 build for MinGW 3.4 and hopefully also for the new versions.
This fix needs some additional files in the dependency package though.

Location:

code/branches/mac_osx/cmake

Files:

• PackageConfigMSVC.cmake (modified) (1 diff)
• PackageConfigMinGW.cmake (modified) (1 diff)

code/branches/mac_osx/cmake/PackageConfigMSVC.cmake

@@ -56 +56 @@
   SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
   SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  # Part of Platform SDK and usually gets linked automatically
+  SET(WMI_LIBRARY  wbemuuid.lib)
 
   # Visual Leak Detector

code/branches/mac_osx/cmake/PackageConfigMinGW.cmake

@@ -50 +50 @@
   SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/zlib1.dll CACHE FILEPATH "")
 
+  # Not included in MinGW, so we need to supply it for OIS
+  SET(WMI_INCLUDE_DIR ${DEP_INCLUDE_DIR}/wmi/include)
+  SET(WMI_LIBRARY     ${DEP_LIBRARY_DIR}/wbemuuid.lib)
+
 ENDIF(MINGW)