Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Ignore:
Timestamp:
Jan 31, 2015, 3:35:49 PM (5 years ago)
Author:
landauf
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • code/trunk/cmake/PackageConfigMSVC.cmake

    r10209 r10210  
    5555  SET(CMAKE_LIBRARY_PATH ${DEP_LIBRARY_DIR})
    5656 
     57  # Certain find scripts don't behave as ecpected to we have
     58  # to specify the libraries ourselves. (dependency older than 7 only)
     59  COMPARE_VERSION_STRINGS(${DEPENDENCY_VERSION} 7 _result TRUE)
     60  IF(_result EQUAL -1)
     61    IF(MSVC10)
     62      SET(TCL_LIBRARY
     63        optimized ${DEP_LIBRARY_DIR}/tcl85t.lib
     64        debug     ${DEP_LIBRARY_DIR}/tcl85tg.lib
     65        CACHE FILEPATH ""
     66      )
     67      SET(ZLIB_LIBRARY
     68        optimized ${DEP_LIBRARY_DIR}/zlib-vc100.lib
     69        debug     ${DEP_LIBRARY_DIR}/zlib-vc100_d.lib
     70        CACHE FILEPATH ""
     71      )
     72    ELSE()
     73      SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
     74      SET(ZLIB_LIBRARY ${DEP_LIBRARY_DIR}/zdll.lib  CACHE FILEPATH "")
     75    ENDIF()
     76  ENDIF()
     77
    5778  # Part of Platform SDK and usually gets linked automatically
    5879  SET(WMI_LIBRARY  wbemuuid.lib)
Note: See TracChangeset for help on using the changeset viewer.