Changeset 7806 for code/forks/sandbox_qt/cmake

Timestamp:

Dec 26, 2010, 12:00:14 AM (13 years ago)

Author:

rgrieder

Message:

Sorted out Visual Leak Detector issues (using new version 2 now).

Location:

code/forks/sandbox_qt/cmake

Files:

• CompilerConfigMSVC.cmake (modified) (1 diff)
• PackageConfigMSVC.cmake (modified) (1 diff)

code/forks/sandbox_qt/cmake/CompilerConfigMSVC.cmake

@@ -35 +35 @@
 
 ######################## Options ########################
-
-# Currently VLD has a problem with MSVC9 although it actually is supported
-IF(MSVC80)
-  OPTION(VISUAL_LEAK_DETECTOR_ENABLE "Memory leak detector" off)
-ENDIF()
-# 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()
 
 # Orxonox only supports MSVC 8 and above, which gets asserted above

code/forks/sandbox_qt/cmake/PackageConfigMSVC.cmake

@@ -56 +56 @@
   #SET(TCL_LIBRARY  ${DEP_LIBRARY_DIR}/tcl85.lib CACHE FILEPATH "")
 
-  # Visual Leak Detector
-  SET(VLD_INCLUDE_DIR  ${DEP_INCLUDE_DIR}/vld   CACHE PATH "")
-  SET(VLD_LIBRARY_DIR  ${DEP_LIBRARY_DIR}       CACHE PATH "")
-  LINK_DIRECTORIES(${VLD_LIBRARY_DIR}) # Used for auto-linking
-  MARK_AS_ADVANCED(VLD_INCLUDE_DIR VLD_LIBRARY_DIR)
-
 ENDIF(MSVC)