Changeset 8221 for code/branches/kicklib/cmake/PackageConfigMSVC.cmake

Timestamp:

Apr 10, 2011, 3:28:27 AM (13 years ago)

Author:

rgrieder

Message:

Changes that allow the Visual Studio 2010 dependencies to be used.

File:

• code/branches/kicklib/cmake/PackageConfigMSVC.cmake (modified) (1 diff)

code/branches/kicklib/cmake/PackageConfigMSVC.cmake

@@ -57 +57 @@
   # Certain find scripts don't behave as ecpected to we have
   # to specify the libraries ourselves.
-  SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
-  SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  IF(MSVC10)
+    SET(TCL_LIBRARY
+      optimized ${DEP_LIBRARY_DIR}/tcl85t.lib
+      debug     ${DEP_LIBRARY_DIR}/tcl85tg.lib
+      CACHE FILEPATH ""
+    )
+    SET(ZLIB_LIBRARY
+      optimized ${DEP_LIBRARY_DIR}/zlibwapi.lib
+      debug     ${DEP_LIBRARY_DIR}/zlibwapi_d.lib
+      CACHE FILEPATH ""
+    )
+  ELSE()
+    SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
+    SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
+  ENDIF()
   # Part of Platform SDK and usually gets linked automatically
   SET(WMI_LIBRARY  wbemuuid.lib)