[Orxonox-commit 5546] r10209 - in code/trunk: cmake cmake/tools src

[muemart at orxonox.net]

Author: muemart
Date: 2015-01-29 17:44:37 +0100 (Thu, 29 Jan 2015)
New Revision: 10209

Modified:
   code/trunk/cmake/PackageConfigMSVC.cmake
   code/trunk/cmake/tools/FindVLD.cmake
   code/trunk/src/SourceConfig.cmake
Log:
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)

Modified: code/trunk/cmake/PackageConfigMSVC.cmake
===================================================================
--- code/trunk/cmake/PackageConfigMSVC.cmake	2015-01-29 09:29:56 UTC (rev 10208)
+++ code/trunk/cmake/PackageConfigMSVC.cmake	2015-01-29 16:44:37 UTC (rev 10209)
@@ -28,7 +28,7 @@
 IF(MSVC)
 
   INCLUDE(CheckPackageVersion)
-  CHECK_PACKAGE_VERSION(4.4 6.0)
+  CHECK_PACKAGE_VERSION(6.0 7.0)
 
   # 64 bit system?
   IF(CMAKE_SIZEOF_VOID_P EQUAL 8)

Modified: code/trunk/cmake/tools/FindVLD.cmake
===================================================================
--- code/trunk/cmake/tools/FindVLD.cmake	2015-01-29 09:29:56 UTC (rev 10208)
+++ code/trunk/cmake/tools/FindVLD.cmake	2015-01-29 16:44:37 UTC (rev 10209)
@@ -25,9 +25,6 @@
 
 INCLUDE(FindPackageHandleStandardArgs)
 
-FIND_PATH(VLD_INCLUDE_DIR vld.h
-  PATH_SUFFIXES "Visual Leak Detector/include"
-)
 FIND_LIBRARY(VLD_LIBRARY
   NAMES vld
   PATH_SUFFIXES "Visual Leak Detector/lib/Win32"
@@ -36,10 +33,8 @@
 # Handle the REQUIRED argument and set POCO_FOUND
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(VLD DEFAULT_MSG
   VLD_LIBRARY
-  VLD_INCLUDE_DIR
 )
 
 MARK_AS_ADVANCED(
-  VLD_INCLUDE_DIR
   VLD_LIBRARY
 )

Modified: code/trunk/src/SourceConfig.cmake
===================================================================
--- code/trunk/src/SourceConfig.cmake	2015-01-29 09:29:56 UTC (rev 10208)
+++ code/trunk/src/SourceConfig.cmake	2015-01-29 16:44:37 UTC (rev 10209)
@@ -62,7 +62,7 @@
   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)
+    ADD_LINKER_FLAGS("-INCLUDE:__imp_?g_vld@@3VVisualLeakDetector@@A" Debug)
     IF(MSVC90)
       # VS 2008 incremental linker crashes with /INCLUDE most of the time
       REMOVE_LINKER_FLAGS("-INCREMENTAL:YES" Debug)
@@ -135,10 +135,6 @@
   INCLUDE_DIRECTORIES(${DBGHELP_INCLUDE_DIR})
 ENDIF()
 
-IF(VISUAL_LEAK_DETECTOR_ENABLE)
-  INCLUDE_DIRECTORIES(${VLD_INCLUDE_DIR})
-ENDIF()
-
 ############## CEGUI OGRE Renderer ##############
 
 IF(CEGUI_OGRE_RENDERER_BUILD_REQUIRED)