cmake: integrate vld

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38811 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5698d70c9d8722c06727c317d54621d27cd45f20..f99a971fae5d2783414981d7cf769cc5823714f5 100644 (file)
--- 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 0b8b77172a0bb8e73d24115d802121a177dd42cc..b19715189592e2074656865b6e6c40154c6c326e 100644 (file)
--- 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)