anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: integrate vld

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38811 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2011-05-22 11:38:10 +00:00
parent 69a049a0d4
commit 82741b94a0
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -155,8 +155,11 @@ endif()
message(STATUS) message(STATUS)
set(EXECUTABLE_OUTPUT_PATH ${TOP_BINARY_DIR}/bin) 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) if(UNIX OR MINGW)
@ -519,12 +522,14 @@ else()
endmacro() endmacro()
endif() endif()
if(MSVC) if(MSVC)
if(LYX_VLD) if(LYX_VLD)
set(LYX_LEAK_DETECTION 1 CACHE TYPE STRING FORCE) set(vld_path ${CMAKE_CURRENT_SOURCE_DIR}/development/Win32/vld)
set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}) add_subdirectory(${vld_path}/cmake)
set(LYX_VLD_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../Win32/vld) include(${vld_path}/cmake/vld.cmake) # forced include
include(${LYX_VLD_PATH}/tools/cmake/vld.cmake) set(vld_dll vld)
endif() endif()
if(LYX_WALL) if(LYX_WALL)

2
development/Win32/vld/cmake/CMakeLists.txt
View File

@ -46,7 +46,7 @@ if (NOT HAVE_DEBUGGING_TOOLS_FOR_WINDOWS)
message(FATAL_ERROR "") message(FATAL_ERROR "")
endif (NOT HAVE_DEBUGGING_TOOLS_FOR_WINDOWS) 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_sources ${vld_path}/src/*.cpp)
file(GLOB vld_headers ${vld_path}/src/*.h) file(GLOB vld_headers ${vld_path}/src/*.h)