Changeset 8412 for code/trunk/cmake

Timestamp:

May 7, 2011, 12:06:56 AM (13 years ago)

Author:

rgrieder

Message:

MSVC specific:
Sorted out Visual Leak Detector handling (it's now treated like a real library, not as a hack).
Also, the vld.h include is gone and with it windows.h.

Location:

code/trunk/cmake

Files:

• LibraryConfig.cmake (modified) (1 diff)
• tools/FindVLD.cmake (added)
• tools/TargetUtilities.cmake (modified) (1 diff)

code/trunk/cmake/LibraryConfig.cmake

@@ -129 +129 @@
   FIND_PACKAGE(DbgHelp)
   FIND_PACKAGE(DirectX       REQUIRED)
+  IF(MSVC)
+    # Check whether we can use Visual Leak Detector
+    FIND_PACKAGE(VLD QUIET)
+  ENDIF()
 ENDIF()
 

code/trunk/cmake/tools/TargetUtilities.cmake

@@ -305 +305 @@
 
   # Visual Leak Detector specific stuff (avoids the include)
-  IF(HAVE_VLD)
-    TARGET_LINK_LIBRARIES(${_target_name} ${VLD_LIBRARY})
+  IF(VISUAL_LEAK_DETECTOR_ENABLE)
+    TARGET_LINK_LIBRARIES(${_target_name} debug ${VLD_LIBRARY})
   ENDIF()