forgot to add this in r22566

[lyx.git] / development / cmake / CMakeLists.txt

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 7941a71d0fce3f9df759fed0ce8d834f1a39d718..60ce8b8e2723dfd2833e4b2e25b98af895e97d18 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -9,6 +9,8 @@
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
+project(lyx)
+
 # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
 # is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
@@ -18,8 +20,8 @@ set(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_SUPPRESS_REGENERATION TRUE)
 
 set(PACKAGE lyx)
-set(PACKAGE_VERSION 1.5.1)
-set(LYX_DATE "August, 2007")
+set(PACKAGE_VERSION 1.6svn)
+set(LYX_DATE "2007/2008")
 #TODO
 set(VERSION_INFO "CMake Build")
 
@@ -56,7 +58,6 @@ if(merge OR merge_rebuild)
        message(STATUS "")
        message(STATUS "All *.cpp files of a project are merged into two files, disable with -Dmerge=0")
        message(STATUS "")
-       set(disable-pch  1)
 else()
        set(merge 0 CACHE TYPE STRING FORCE)
        set(MERGE_FILES 0 CACHE TYPE STRING FORCE)
@@ -109,7 +110,6 @@ if(UNIX)
 endif()
 
 
-project(lyx)
 find_package(Qt4 REQUIRED)
 add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
 
@@ -171,17 +171,20 @@ endif()
 
 add_definitions(-DBOOST_USER_CONFIG="<config.h>")
        
-if(MSVC AND NOT disable-pch)
+if(MSVC AND NOT disable-pch AND NOT MERGE_FILES)
+       message("-----")
+       message("----- using precompiled headers, disable with -Ddisable-pch=1")
+       message("-----")
        configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h
                ${CMAKE_BINARY_DIR}/pcheaders.h)
-       configure_file(${CMAKE_SOURCE_DIR}/config.C.cmake
-               ${CMAKE_BINARY_DIR}/config_pch.C)
+       configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake
+               ${CMAKE_BINARY_DIR}/config_pch.cpp)
        macro(lyx_add_msvc_pch name_)
                set_source_files_properties(${${name_}_sources} PROPERTIES
                        COMPILE_FLAGS "/Yuconfig.h /Fp\$(IntDir)/config.pch")
-               set_source_files_properties(${CMAKE_BINARY_DIR}/config_pch.C PROPERTIES
+               set_source_files_properties(${CMAKE_BINARY_DIR}/config_pch.cpp PROPERTIES
                        COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch")
-               set(${name_}_sources ${${name_}_sources} ${CMAKE_BINARY_DIR}/config_pch.C
+               set(${name_}_sources ${${name_}_sources} ${CMAKE_BINARY_DIR}/config_pch.cpp
                        ${CMAKE_BINARY_DIR}/pcheaders.h)
                add_definitions(/DLYX_ENABLE_PCH)
        endmacro(lyx_add_msvc_pch)
@@ -192,12 +195,34 @@ if(MSVC AND NOT disable-pch)
        set(CMAKE_CXX_FLAGS_MINSIZEREL
                "${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST")
 else()
+       if(MSVC)
+               message("-----")
+               message("----- precompiled headers disabled, enable with -Ddisable-pch=0")
+               message("-----")
+       endif()
        set(disable-pch TRUE CACHE TYPE STRING)
        macro(lyx_add_msvc_pch)
        endmacro(lyx_add_msvc_pch)
 endif()
 
 if(MSVC)       
+       if(vld)
+               set(vld 1 CACHE TYPE STRING FORCE)
+               set(LYX_LEAK_DETECTION 1 CACHE TYPE STRING FORCE)
+               message(STATUS "")
+               message(STATUS "Leak detection enabled, disable with -Dvld=0")
+               message(STATUS "")
+               set(LIBRARY_OUTPUT_PATH  ${EXECUTABLE_OUTPUT_PATH})
+               set(vld_path ${CMAKE_CURRENT_SOURCE_DIR}/../Win32/vld)
+               include(${vld_path}/tools/cmake/vld.cmake)
+       else()
+               set(vld 0 CACHE TYPE STRING FORCE)
+               set(LYX_LEAK_DETECTION 0 CACHE TYPE STRING FORCE)
+               message(STATUS "")
+               message(STATUS "Enable leak detection with -Dvld=1")
+               message(STATUS "")
+       endif()
+
        if(WALL)
                set(WALL 1 CACHE TYPE STRING FORCE)
                
@@ -220,7 +245,7 @@ if(MSVC)
                # add here warnings which should produce an error /weXXXX
                set(MSVC_W_ERROR   "/we4101 /we4189")
                # add here warnings which should be disabled /wdXXXX
-               set(MSVC_W_DISABLE "/wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180")
+               set(MSVC_W_DISABLE "/wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180")
                
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
@@ -238,7 +263,7 @@ if(MSVC)
                # add here warnings which should produce an error /weXXXX
                set(MSVC_W_ERROR   "/we4101 /we4189")
                # add here warnings which should be disabled /wdXXXX
-               set(MSVC_W_DISABLE "/wd4800 /wd4996 /wd4267 /wd4180")
+               set(MSVC_W_DISABLE "/wd4355 /wd4800 /wd4996 /wd4267 /wd4180")
                
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
@@ -256,10 +281,16 @@ if(MSVC)
        
 endif()
 
-# create config.h
-include(ConfigureChecks.cmake)
+# compiler tests, config.h generation
+if(UNIX)
+       include(ConfigureChecks.cmake)
+       configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h)
+else()
+       configure_file(configCompiler.h.msvc ${CMAKE_BINARY_DIR}/configCompiler.h)
+endif()
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
+
 find_package(ICONV REQUIRED)
 add_definitions(-DHAVE_ICONV=1)