Changeset 10210 for code/trunk

Timestamp:

Jan 31, 2015, 3:35:49 PM (9 years ago)

Author:

landauf

Message:

not sure how the MSVC dependency package v7 works, but v6 still needs the hardcoded library names

File:

• code/trunk/cmake/PackageConfigMSVC.cmake (modified) (1 diff)

code/trunk/cmake/PackageConfigMSVC.cmake

@@ -55 +55 @@
   SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR})
   
+  # Certain find scripts don't behave as ecpected to we have
+  # to specify the libraries ourselves. (dependency older than 7 only)
+  COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 7 _result TRUE)
+  IF(_result EQUAL -1)
+    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}/zlib-vc100.lib
+        debug     ${DEP_LIBRARY_DIR}/zlib-vc100_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()
+  ENDIF()
+
   # Part of Platform SDK and usually gets linked automatically
   SET(WMI_LIBRARY  wbemuuid.lib)