Author: kuemmel
Date: Sun May 22 13:38:10 2011
New Revision: 38811
URL: http://www.lyx.org/trac/changeset/38811
Log:
cmake: integrate vld
Modified:
lyx-devel/trunk/CMakeLists.txt
lyx-devel/trunk/development/Win32/vld/cmake/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Sun May 22 13:29:48 2011 (r38810)
+++ lyx-devel/trunk/CMakeLists.txt Sun May 22 13:38:10 2011 (r38811)
@@ -155,8 +155,11 @@
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 @@
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)
Modified: lyx-devel/trunk/development/Win32/vld/cmake/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/development/Win32/vld/cmake/CMakeLists.txt Sun May 22
13:29:48 2011 (r38810)
+++ lyx-devel/trunk/development/Win32/vld/cmake/CMakeLists.txt Sun May 22
13:38:10 2011 (r38811)
@@ -46,7 +46,7 @@
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)
