Changeset 10209

Timestamp:

Jan 29, 2015, 5:44:37 PM (10 years ago)

Author:

muemart

Message:

More MSVC fixes

• Update dependecy package version requirements
• Update Visual Leak Detector detection and linking Headers are not needed because symbols are force referenced (this is all the header does, anyway)

Location:

code/trunk

Files:

• cmake/PackageConfigMSVC.cmake (modified) (1 diff)
• cmake/tools/FindVLD.cmake (modified) (2 diffs)
• src/SourceConfig.cmake (modified) (2 diffs)

code/trunk/cmake/PackageConfigMSVC.cmake

@@ -29 +29 @@
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(4.4 6.0)
+  CHECK_PACKAGE_VERSION(6.0 7.0)
 
   # 64 bit system?

code/trunk/cmake/tools/FindVLD.cmake

@@ -26 +26 @@
 INCLUDE(FindPackageHandleStandardArgs)
 
-FIND_PATH(VLD_INCLUDE_DIR vld.h
-  PATH_SUFFIXES "Visual Leak Detector/include"
-)
 FIND_LIBRARY(VLD_LIBRARY
   NAMES vld
@@ -37 +34 @@
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(VLD DEFAULT_MSG
   VLD_LIBRARY
-  VLD_INCLUDE_DIR
 )
 
 MARK_AS_ADVANCED(
-  VLD_INCLUDE_DIR
   VLD_LIBRARY
 )

code/trunk/src/SourceConfig.cmake

@@ -63 +63 @@
   IF(VISUAL_LEAK_DETECTOR_ENABLE)
     # Force library linking by forcing the inclusion of a symbol
-    ADD_LINKER_FLAGS("-INCLUDE:__imp_?vld@@3VVisualLeakDetector@@A" Debug)
+    ADD_LINKER_FLAGS("-INCLUDE:__imp_?g_vld@@3VVisualLeakDetector@@A" Debug)
     IF(MSVC90)
       # VS 2008 incremental linker crashes with /INCLUDE most of the time
@@ -136 +136 @@
 ENDIF()
 
-IF(VISUAL_LEAK_DETECTOR_ENABLE)
-  INCLUDE_DIRECTORIES(${VLD_INCLUDE_DIR})
-ENDIF()
-
 ############## CEGUI OGRE Renderer ##############