From 82741b94a09ec47cba9a9e08caad4521dee2357d Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sun, 22 May 2011 11:38:10 +0000
Subject: [PATCH] cmake: integrate vld

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38811 a592a061-630c-0410-9148-cb99ea01b6c8
---
 CMakeLists.txt                             | 17 +++++++++++------
 development/Win32/vld/cmake/CMakeLists.txt |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5698d70c9d..f99a971fae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,8 +155,11 @@ endif()
 message(STATUS)
 
 set(EXECUTABLE_OUTPUT_PATH  ${TOP_BINARY_DIR}/bin)
-set(LIBRARY_OUTPUT_PATH  ${TOP_BINARY_DIR}/lib)
-
+if(WIN32)
+	set(LIBRARY_OUTPUT_PATH  ${EXECUTABLE_OUTPUT_PATH})
+else()
+	set(LIBRARY_OUTPUT_PATH  ${TOP_BINARY_DIR}/lib)
+endif()
 
 
 if(UNIX OR MINGW)
@@ -519,12 +522,14 @@ else()
 	endmacro()
 endif()
 
+
 if(MSVC)
+
 	if(LYX_VLD)
-		set(LYX_LEAK_DETECTION 1 CACHE TYPE STRING FORCE)
-		set(LIBRARY_OUTPUT_PATH  ${EXECUTABLE_OUTPUT_PATH})
-		set(LYX_VLD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../Win32/vld)
-		include(${LYX_VLD_PATH}/tools/cmake/vld.cmake)
+		set(vld_path ${CMAKE_CURRENT_SOURCE_DIR}/development/Win32/vld)
+		add_subdirectory(${vld_path}/cmake)
+		include(${vld_path}/cmake/vld.cmake) # forced include
+		set(vld_dll vld)
 	endif()
 
 	if(LYX_WALL)
diff --git a/development/Win32/vld/cmake/CMakeLists.txt b/development/Win32/vld/cmake/CMakeLists.txt
index 0b8b77172a..b197151895 100644
--- a/development/Win32/vld/cmake/CMakeLists.txt
+++ b/development/Win32/vld/cmake/CMakeLists.txt
@@ -46,7 +46,7 @@ if (NOT HAVE_DEBUGGING_TOOLS_FOR_WINDOWS)
 	message(FATAL_ERROR "")
 endif (NOT HAVE_DEBUGGING_TOOLS_FOR_WINDOWS)
 
-set(vld_path ${CMAKE_CURRENT_SOURCE_DIR}/../..)
+set(vld_path ${CMAKE_CURRENT_SOURCE_DIR}/..)
 
 file(GLOB vld_sources ${vld_path}/src/*.cpp)
 file(GLOB vld_headers ${vld_path}/src/*.h)
-- 
2.39.2