The time_t type seems to be an unsigned type when compiling with MSVC.

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5698d70c9d8722c06727c317d54621d27cd45f20..fce998eccd519c4e546273acfecdb1c6413e92b0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,18 @@ if(NOT help AND NOT HELP)
        project(${LYX_PROJECT})
 endif()
 
+if(UNIX)
+       FIND_PROGRAM(DPKG_ARCHITECTURE_EXECUTABLE dpkg-architecture)
+       if(DPKG_ARCHITECTURE_EXECUTABLE)
+               EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE)
+       endif()
+endif()
+if(ARCH_TRIPLET)
+       set(SYSTEM_LIB_DIRS /usr/lib /usr/lib/${ARCH_TRIPLET} /usr/local/lib)
+else()
+       set(SYSTEM_LIB_DIRS /usr/lib /usr/local/lib)
+endif()
+
 include(LyXMacros)
 
 # Usage LYX_OPTION
@@ -102,7 +114,6 @@ if(help OR HELP)
        message(STATUS)
 else()
 
-
 # Check option dependencies
 
 if(LYX_CPACK)
@@ -155,8 +166,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 +533,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)