Changeset 8412 for code/trunk

Timestamp:

May 7, 2011, 12:06:56 AM (14 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

Files:

• cmake/LibraryConfig.cmake (modified) (1 diff)
• cmake/tools/FindVLD.cmake (added)
• cmake/tools/TargetUtilities.cmake (modified) (1 diff)
• src/CMakeLists.txt (modified) (2 diffs)
• src/OrxonoxConfig.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()
 

code/trunk/src/CMakeLists.txt

@@ -54 +54 @@
   ADD_COMPILER_FLAGS("-DNTDDI_VERSION=0x05010000")
 ENDIF(WIN32)
+
+# Visual Leak Dectector configuration
+IF(MSVC AND VLD_FOUND)
+  OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" OFF)
+  IF(VISUAL_LEAK_DETECTOR_ENABLE)
+    # Force library linking by forcing the inclusion of a symbol
+    ADD_LINKER_FLAGS("-INCLUDE:__imp_?vld@@3VVisualLeakDetector@@A" Debug)
+    IF(MSVC90)
+      # VS 2008 incremental linker crashes with /INCLUDE most of the time
+      REMOVE_LINKER_FLAGS("-INCREMENTAL:YES" Debug)
+      ADD_LINKER_FLAGS   ("-INCREMENTAL:NO"  Debug)
+    ENDIF()
+  ENDIF()
+ENDIF()
 
 ######### Library Behaviour (external) ##########
@@ -110 +124 @@
 IF (DBGHELP_FOUND)
   INCLUDE_DIRECTORIES(${DBGHELP_INCLUDE_DIR})
+ENDIF()
+
+IF(VISUAL_LEAK_DETECTOR_ENABLE)
+  INCLUDE_DIRECTORIES(${VLD_INCLUDE_DIR})
 ENDIF()
 

code/trunk/src/OrxonoxConfig.cmake

@@ -80 +80 @@
 ADD_COMPILER_FLAGS("-DCMAKE_MinSizeRel_BUILD"     MinSizeRel)
 
-IF(MSVC)
-  # Check whether we can use Visual Leak Detector
-  FIND_FILE(VLD_DLL vld_x86.dll)
-  IF(VLD_DLL)
-    SET(HAVE_VLD TRUE)
-    OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" off)
-    # Make sure the value is "on" or "off" for vld.ini
-    IF(VISUAL_LEAK_DETECTOR_ENABLE)
-      SET(VISUAL_LEAK_DETECTOR_ENABLE on)
-    ELSE()
-      SET(VISUAL_LEAK_DETECTOR_ENABLE off)
-    ENDIF()
-    SET(VLD_LIBRARY vld.lib)
-    # Force symbol reference
-    # The alternative would be to include vld.h everywhere (includes windows.h)
-    ADD_LINKER_FLAGS("-INCLUDE:__imp_?vld@@3VVisualLeakDetector@@A" Debug)
-  ENDIF()
-  MARK_AS_ADVANCED(VLD_DLL)
-ENDIF()
-
 ############## Configured Headers ###############