Changeset 11113 for code/trunk/cmake
- Timestamp:
- Feb 14, 2016, 3:42:37 PM (9 years ago)
- Location:
- code/trunk/cmake
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk/cmake/LibraryConfig.cmake
r11097 r11113 127 127 128 128 IF(WIN32) 129 FIND_PACKAGE(DbgHelp)130 FIND_PACKAGE(DirectX REQUIRED)131 129 IF(MSVC) 132 130 # Check whether we can use Visual Leak Detector 133 131 FIND_PACKAGE(VLD QUIET) 132 FIND_PACKAGE(DbgHelp) 133 FIND_PACKAGE(DirectX REQUIRED) 134 134 ENDIF() 135 135 ENDIF() -
code/trunk/cmake/PackageConfigMinGW.cmake
r9687 r11113 29 29 30 30 INCLUDE(CheckPackageVersion) 31 CHECK_PACKAGE_VERSION( 6.0 7.0)31 CHECK_PACKAGE_VERSION(7.1) 32 32 33 33 # 64 bit system? … … 53 53 SET(ZLIB_LIBRARY ${DEP_BINARY_DIR}/libzlib.dll CACHE FILEPATH "") 54 54 55 # Not included in MinGW, so we need to supply it for OIS 56 SET(WMI_INCLUDE_DIR ${DEP_INCLUDE_DIR}/wmi/include) 57 SET(WMI_LIBRARY ${DEP_LIBRARY_DIR}/wbemuuid.lib) 55 # Define libraries that are part of mingw64: 56 # - DirectX (Needed for OIS): 57 SET(DIRECTX_LIBRARIES dinput8 dxguid) 58 SET(WMI_LIBRARY wbemuuid) 59 # - DbgHelp (Needed for SignalHandler in util library): 60 SET(DBGHELP_FOUND true) 61 SET(DBGHELP_LIBRARY dbghelp) 58 62 59 63 ENDIF(MINGW)
Note: See TracChangeset
for help on using the changeset viewer.