]> git.lyx.org Git - lyx.git/blobdiff - development/cmake/CMakeLists.txt
TR1: use std::tr1 regex with msvc10
[lyx.git] / development / cmake / CMakeLists.txt
index d3e20bd8c916145b94880b318581f988c8de6b9b..2237d4856d9ace27d16978c2d7aba7d3ead61969 100644 (file)
@@ -1,11 +1,19 @@
+
 # This file is part of LyX, the document processor.
 # Licence details can be found in the file COPYING.
 #
-# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net>
-#
+# Copyright (c) 2006-2010 Peter Kümmel, <syntheticpp@gmx.net>
+# Copyright (c) 2008-2010 Kornel Benko, <Kornel.Benko@berlin.de>
+
+
+cmake_minimum_required(VERSION 2.4)
 
-#not really needed
-#CMAKE_MINIMUM_REQUIRED(VERSION 2.4.4 FATAL_ERROR)
+if(COMMAND cmake_policy)
+       cmake_policy(SET CMP0003 OLD)
+       cmake_policy(SET CMP0005 OLD)
+endif(COMMAND cmake_policy)
+
+project(lyx)
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 
@@ -13,27 +21,95 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 # is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
 set(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
+
+
+option(lyxinstall "Build install projects/rules" ON)
+
+
+
+
+# Supress regeneration
+set(CMAKE_SUPPRESS_REGENERATION TRUE)
 
-set(PACKAGE lyx)
-set(PACKAGE_VERSION 1.5.1)
-set(LYX_DATE "August, 2007")
-#TODO
 set(VERSION_INFO "CMake Build")
 
-set(PROGRAM_SUFFIX "")
-set(LYX_ABS_INSTALLED_DATADIR "/usr/local/share/lyx")
-set(LYX_ABS_INSTALLED_LOCALEDIR "/usr/local/share/locale")
-set(LYX_ABS_TOP_SRCDIR "${CMAKE_SOURCE_DIR}")
+# Try to get some informations from configure.ac
 
+include(LyXPaths)              #called here to define the needed TOP_SRC_DIR-variable
+file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
 
 if(WIN32)
-       set(USE_WINDOWS_PACKAGING 1)
+  set(USE_WINDOWS_PACKAGING 1)
 elseif(APPLE)
-       set(USE_MACOSX_PACKAGING 1)
+  set(USE_MACOSX_PACKAGING 1)
 else()
-       set(USE_POSIX_PACKAGING 1)
+  set(USE_POSIX_PACKAGING 1)
 endif()
 
+macro(setstripped _varname _value)
+  string(STRIP ${_value} _v)
+  if(USE_POSIX_PACKAGING)
+    string(TOLOWER ${_v} ${_varname})
+  else()
+    set(${_varname} ${_v})
+  endif()
+endmacro(setstripped)
+
+foreach(_c_l ${_config_lines} )
+  if(_c_l MATCHES "^AC_INIT\\(\([^,]+\),\([^,]+\), *\\[\([^,]+\)\\] *,\(.*\)")
+    setstripped(PACKAGE_BASE ${CMAKE_MATCH_1})
+    setstripped(PACKAGE_VERSION ${CMAKE_MATCH_2})
+    setstripped(PACKAGE_BUGREPORT ${CMAKE_MATCH_3})
+    if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\).*$")
+      set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
+      set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
+      set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
+      set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
+      set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
+    endif()
+  endif()
+  if(_c_l MATCHES "^AC_SUBST\\( *LYX_DATE *, *\\[\\\"(.*)\\\"\\].*")
+    set(LYX_DATE "${CMAKE_MATCH_1}")
+  endif()
+endforeach(_c_l)
+
+if(UseVersionSuffix)
+  message(STATUS "-- Using versioned PACKAGE. Disable with -DUseVersionSuffix=0")
+  set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
+  set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
+else()
+  message(STATUS "-- PACKAGE not versioned, to enable use -DUseVersionSuffix=1")
+  set(PACKAGE ${PACKAGE_BASE})
+  set(PROGRAM_SUFFIX "")
+endif()
+
+if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+  # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
+  if (UNIX)
+    # don't use the default "/usr/local"
+    # but respect the user-choice on the command-line
+    SET(CMAKE_INSTALL_PREFIX
+      "/usr/local/${project}${LYX_INSTALL_SUFFIX}" CACHE PATH "LyX install prefix" FORCE)
+  endif()
+  if(WIN32)
+    SET(CMAKE_INSTALL_PREFIX
+      ${CMAKE_INSTALL_PREFIX}/${LYX_INSTALL_SUFFIX} CACHE PATH "LyX install prefix" FORCE)
+  endif()
+endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+
+if (WIN32)
+  set(DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
+else()
+  set(DATA_SUBDIR "" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
+endif()
+
+set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
+set(LYX_LOCALEDIR "locale")
+set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${DATA_SUBDIR}${LYX_LOCALEDIR}")
+set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
+
+
 if(NOT GROUP_CODE)
        #set(GROUP_CODE "The Golden Code")
        set(GROUP_CODE flat)
@@ -42,8 +118,8 @@ endif()
 # lyx's source files
 set(LYX_CPP_FILES *.cpp)
 set(LYX_HPP_FILES *.h)
+set(LYX_MOC_FILES moc_*.cpp)
 
-include(LyXPaths)
 include(LyXMacros)
 include(ProjectSourceGroup)
 
@@ -53,7 +129,7 @@ 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)
+       add_definitions(-DLYX_MERGED_BUILD)
 else()
        set(merge 0 CACHE TYPE STRING FORCE)
        set(MERGE_FILES 0 CACHE TYPE STRING FORCE)
@@ -72,11 +148,14 @@ endif()
 
 if(release)
        set(CMAKE_BUILD_TYPE Release CACHE TYPE STRING FORCE)
+       set(release TRUE CACHE TYPE STRING FORCE)
        set(release)
 endif()
 
 if(debug)
        set(CMAKE_BUILD_TYPE Debug CACHE TYPE STRING FORCE)
+       set(debug TRUE CACHE TYPE STRING FORCE)
+       set(debug)
 endif()
 
 if(shared)
@@ -86,11 +165,13 @@ else()
        set(library_type STATIC)
 endif()
 
-if(UNIX)
+if(NOT MSVC)
        if(NOT quiet)
                set(CMAKE_VERBOSE_MAKEFILE ON CACHE TYPE STRING FORCE)
                message(STATUS "verbose Makefile, disable with -Dquiet=1")
                message(STATUS "")
+       else()
+               set(CMAKE_VERBOSE_MAKEFILE OFF CACHE TYPE STRING FORCE)
        endif()
        set(LYX_CXX_FLAGS -Wall)
        if(stdlib-debug)
@@ -99,16 +180,19 @@ if(UNIX)
        if(concept-checks)
                set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
        endif()
-       set(CMAKE_CXX_FLAGS          "${LYX_CXX_FLAGS}" CACHE TYPE STRING FORCE)
-       set(CMAKE_CXX_FLAGS_DEBUG    "${LYX_CXX_FLAGS} -O -g -D_DEBUG" CACHE TYPE STRING FORCE)
-       set(CMAKE_CXX_FLAGS_RELEASE  "${LYX_CXX_FLAGS} -O3 -DNDEBUG" CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS          "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS_DEBUG    "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g -D_DEBUG" CACHE TYPE STRING FORCE)
+       if(MINGW)
+               set(CMAKE_CXX_FLAGS_RELEASE  "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE)
+       else()
+               set(CMAKE_CXX_FLAGS_RELEASE  "${LYX_CXX_FLAGS} -O3 -DNDEBUG" CACHE TYPE STRING FORCE)
+       endif()
        set(CMAKE_CXX_FLAGS_PROFILE  "${CMAKE_CXX_FLAGS_RELEASE} -pg" CACHE TYPE STRING FORCE)
 endif()
 
 
-project(lyx)
 find_package(Qt4 REQUIRED)
-add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
+add_definitions(-DQT_NO_STL -DQT_NO_KEYWORDS)
 
 find_package(ZLIB REQUIRED)
 
@@ -120,20 +204,59 @@ else()
 endif()
 set(aspell)
 
-message("")
+set(use_external_libintl TRUE)
+
+if(use_external_libintl)
+       find_package(Libintl REQUIRED)
+       add_definitions(-DHAVE_GETTEXT)
+endif()
+
+if(WIN32)
+  find_library(HUNSPELL_LIBRARY "libhunspell")
+else()
+  #find_library(HUNSPELL_LIBRARY NAME "hunspell" PATH "/usr/local/lib" "/usr/lib" NO_DEFAULT_PATH)
+  find_library(HUNSPELL_LIBRARY NAMES "hunspell" "hunspell-1.2" PATHS "/usr/local/lib" "/usr/lib" "/usr/lib64")
+endif()
+if (HUNSPELL_LIBRARY)
+  find_file(HUNSPELL_FOUND "hunspell/hunspell.hxx")
+endif()
+
+if (HUNSPELL_FOUND)
+  add_definitions(-DUSE_HUNSPELL=1)
+  message(STATUS "----- Building with USE_HUNSPELL")
+else()
+  message(STATUS "----- Hunspell not found, building without hunspell support")
+endif()
+
+if(WIN32)
+  find_library(ENCHANT_LIBRARY "libenchant")
+  find_path(ENCHANT_INCLUDE_DIR "enchant++.h")
+else()
+  find_library(ENCHANT_LIBRARY "enchant"  "/usr/local/lib" "/usr/lib" "/usr/local/lib" "/opt/local/lib")
+  find_path(ENCHANT_INCLUDE_DIR "enchant++.h" PATHS /usr/local/include /usr/local/include/enchant /usr/include /usr/include/enchant /opt/local/include/enchant)
+endif()
+if (ENCHANT_LIBRARY AND ENCHANT_INCLUDE_DIR)
+  set(ENCHANT_FOUND TRUE)
+  add_definitions(-DUSE_ENCHANT=1)
+  message(STATUS "----- Building with USE_ENCHANT")
+else()
+  message(STATUS "----- Enchant not found, building without enchant support")
+endif()
+
+message(STATUS "")
 if(nls OR all)
        set(nls TRUE CACHE TYPE STRING)
        add_definitions(-DENABLE_NLS=1)
-       message("----- Building with ENABLE_NLS")
-else() 
-       message("----- No nls, to enable use -Dnls=1")
+       message(STATUS "----- Building with ENABLE_NLS")
+else()
+       message(STATUS "----- No nls, to enable use -Dnls=1")
 endif()
 set(nls)
 if(ASPELL_FOUND)
        add_definitions(-DUSE_ASPELL=1)
-       message("----- Building with USE_ASPELL")
-else() 
-       message("----- No aspell, to get more information use -Daspell=1")
+       message(STATUS "----- Building with USE_ASPELL")
+else()
+       message(STATUS "----- No aspell, to get more information use -Daspell=1")
 endif()
 set(all)
 
@@ -142,137 +265,309 @@ if(WIN32)
                set(noconsole TRUE CACHE TYPE STRING)
                set(WIN32_CONSOLE WIN32)
                set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY})
-               message("----- Console disabled")
+               message(STATUS "----- Console disabled")
+       else()
+               message(STATUS "----- Console enabled, disable it with -Dnoconsole=1")
+       endif()
+       if(MSVC)
+               add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
+               # disable checked iterators for msvc release builds to get maximum speed
+               set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
        else()
-               message("----- Console enabled, disable it with -Dnoconsole=1")
+               add_definitions(-DWINVER=0x0500)
        endif()
 endif()
 
-set(PROGRAM_SUFFIX "\"\"")
-set(LYX_ABS_TOP_SRCDIR "${CMAKE_SOURCE_DIR}")
-set(LYX_ABS_INSTALLED_DATADIR "/usr/local/share/lyx")
-set(LYX_ABS_INSTALLED_LOCALEDIR "/usr/local/share/locale")
-
-message("")
-message("----- PROGRAM_SUFFIX              : ${PROGRAM_SUFFIX}")
-message("----- LYX_ABS_TOP_SRCDIR          : ${LYX_ABS_TOP_SRCDIR}")
-message("----- LYX_ABS_INSTALLED_DATADIR   : ${LYX_ABS_INSTALLED_DATADIR}")
-message("----- LYX_ABS_INSTALLED_LOCALEDIR : ${LYX_ABS_INSTALLED_LOCALEDIR}")
-message("")
+message(STATUS "")
+foreach(_v PACKAGE PACKAGE_VERSION
+    PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER
+    LYX_ABS_TOP_SRCDIR
+    LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)
+  if(NOT DEFINED ${_v})
+    message(FATAL_ERROR "${_v} not defined")
+  endif()
+  string(SUBSTRING "${_v}                            " 0 28 _v1)
+  message(STATUS "----- ${_v1}: ${${_v}}")
+endforeach(_v)
+message(STATUS "")
+
+
+# PCHs not supported by cmake: http://www.cmake.org/Bug/view.php?id=1260
+# Not sure if it works for all non-msvc compilers
+include(PCHSupport_26)
+if (MSVC)
+       option(disable-pch "Disable precompiled headers" ON)
+else()
+       option(disable-pch "Disable precompiled headers" ON)
+endif()
 
-if(MSVC)
-       add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)      
-       # disable checked iterators for msvc release builds to get maximum speed
-       set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
-endif()
-
-add_definitions(-DBOOST_USER_CONFIG="<config.h>")
-       
-if(MSVC AND NOT disable-pch)
-       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)
-       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
-                       COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch")
-               set(${name_}_sources ${${name_}_sources} ${CMAKE_BINARY_DIR}/config_pch.C
-                       ${CMAKE_BINARY_DIR}/pcheaders.h)
-               add_definitions(/DLYX_ENABLE_PCH)
-       endmacro(lyx_add_msvc_pch)
-       set(CMAKE_CXX_FLAGS_DEBUG
-               "${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
-       set(CMAKE_CXX_FLAGS_RELEASE
-               "${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
-       set(CMAKE_CXX_FLAGS_MINSIZEREL
-               "${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST")
+if(NOT disable-pch)
+
+       message(STATUS "-----")
+       message(STATUS "----- using precompiled headers, disable with -Ddisable-pch=1")
+       message(STATUS "-----")
+       configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h ${CMAKE_BINARY_DIR}/pcheaders.h)
+       configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake ${CMAKE_BINARY_DIR}/config_pch.cpp)
+       add_definitions(-DLYX_ENABLE_PCH)
+
+       if(MSVC AND NOT MERGE_FILES)
+               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.cpp PROPERTIES
+                               COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch")
+                       set(${name_}_sources ${${name_}_sources} ${CMAKE_BINARY_DIR}/config_pch.cpp
+                               ${CMAKE_BINARY_DIR}/pcheaders.h)
+                       set(CMAKE_CXX_FLAGS_DEBUG       "${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
+                       set(CMAKE_CXX_FLAGS_RELEASE     "${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
+                       set(CMAKE_CXX_FLAGS_MINSIZEREL  "${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST")                  
+               endmacro(lyx_add_msvc_pch)
+               macro(lyx_add_gcc_pch name_)
+               endmacro()
+       else()
+               macro(lyx_add_msvc_pch name_)
+               endmacro()
+               macro(lyx_add_gcc_pch name_)
+                       add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT4)
+                       ADD_PRECOMPILED_HEADER(${name_} ${CMAKE_BINARY_DIR}/config_pch.cpp ${CMAKE_BINARY_DIR}/config.h.gch)
+               endmacro()
+       endif()
 else()
+       if(MSVC)
+               message(STATUS "-----")
+               message(STATUS "----- precompiled headers disabled, enable with -Ddisable-pch=0")
+               message(STATUS "-----")
+       endif()
        set(disable-pch TRUE CACHE TYPE STRING)
        macro(lyx_add_msvc_pch)
        endmacro(lyx_add_msvc_pch)
+       macro(lyx_add_gcc_pch name_)
+       endmacro()
 endif()
 
-if(MSVC)       
+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)
-               
+
                # Use the highest warning level
                set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE)
                set(WARNING_LEVEL_MESSAGE "(switch to warning level 3 with -DWALL=0)")
-               
+
                if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
                        string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
                else()
                        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
                endif()
-               
+
                if(CMAKE_C_FLAGS MATCHES "/W[0-4]")
                        string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
                else()
                        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
                endif()
-               
+
                # 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 "/wd4288 /wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180 /wd4231")
+
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-               set(CMAKE_CXX_FLAGS_RELEASEs
+               set(CMAKE_CXX_FLAGS_RELEASE
                        "${CMAKE_CXX_FLAGS_RELEASE} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
                set(CMAKE_CXX_FLAGS_MINSIZEREL
                        "${CMAKE_CXX_FLAGS_MINSIZEREL} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-               
-       else()  
+
+       else()
                set(WALL 0 CACHE TYPE STRING FORCE)
-               
+
                set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE)
                set(WARNING_LEVEL_MESSAGE "(switch to warning level 4 with -DWALL=1)")
-       
+
                # 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 "/wd4288 /wd4355 /wd4800 /wd4996 /wd4267 /wd4180 /wd4231")
+
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
                set(CMAKE_CXX_FLAGS_RELEASE
                        "${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
                set(CMAKE_CXX_FLAGS_MINSIZEREL
                        "${CMAKE_CXX_FLAGS_MINSIZEREL} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-               
+
        endif()
-       
-       message("----- Warning level      : ${CMAKE_CXX_WARNING_LEVEL}  ${WARNING_LEVEL_MESSAGE}")
-       message("----- Warnings as errors : ${MSVC_W_ERROR}")
-       message("----- Warnings disabled  : ${MSVC_W_DISABLE}")
-       message("")
-       
+       set(CMAKE_CXX_FLAGS_DEBUG
+               "${CMAKE_CXX_FLAGS_DEBUG} /Zc:wchar_t-")
+       set(CMAKE_CXX_FLAGS_RELEASE
+               "${CMAKE_CXX_FLAGS_RELEASE} /Zc:wchar_t-")
+       set(CMAKE_CXX_FLAGS_MINSIZEREL
+               "${CMAKE_CXX_FLAGS_MINSIZEREL} /Zc:wchar_t-")
+
+       message(STATUS "----- Warning level      : ${CMAKE_CXX_WARNING_LEVEL}  ${WARNING_LEVEL_MESSAGE}")
+       message(STATUS "----- Warnings as errors : ${MSVC_W_ERROR}")
+       message(STATUS "----- Warnings disabled  : ${MSVC_W_DISABLE}")
+       message(STATUS "")
+
+endif()
+
+
+FIND_PROGRAM(_PERL_EXECUTABLE perl)
+if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
+    if(nls OR all)
+      find_package(LyXGettext REQUIRED)
+      include_directories(${TOP_SRC_DIR}/po)
+      add_subdirectory(po)
+    endif()
+endif()
+
+option(debug_glibc "Enable libstdc++ debug mode" OFF)
+option(debug_glibc_pedantic "Enable libstdc++pedantic debug mode" OFF)
+
+if(debug_glibc)
+  set(_GLIBCXX_DEBUG 1)
+endif()
+
+if(debug_glibc_pedantic)
+  set(_GLIBCXX_DEBUG_PEDANTIC 1)
+endif()
+
+# compiler tests, config.h generation
+if(MSVC AND NOT CONFIGURECHECKS)
+       configure_file(configCompiler.h.msvc ${CMAKE_BINARY_DIR}/configCompiler.h)
+else()
+       include(ConfigureChecks.cmake)
+       configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h)
 endif()
 
-# create config.h
-include(ConfigureChecks.cmake)
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
 find_package(ICONV REQUIRED)
 add_definitions(-DHAVE_ICONV=1)
 
 
-#TODO: insource is not the best place
-configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in 
-               ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py)
-     
-include_directories( 
-       ${CMAKE_BINARY_DIR} 
-       ${TOP_SRC_DIR}/src 
-       ${TOP_SRC_DIR}/boost)
+include_directories(
+  ${CMAKE_BINARY_DIR}
+  ${TOP_SRC_DIR}/src)
+
+option(UseExternalBoost "Use external boost" OFF)
+if(UseExternalBoost)
+  message(STATUS "Searching for boost")
+  find_package(Boost COMPONENTS signals regex)
+  if(Boost_FOUND)
+    message(STATUS "Boost found")
+    message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
+    set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
+  else()
+    message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
+  endif()
+else()
+  message(STATUS "----- Using internal boost. To build with installed version use -DUseExternalBoost:BOOL=ON")
+  set(Lyx_Boost_Libraries boost_signals ${BOOST_REGEX_LIB})
+  add_definitions(-DBOOST_USER_CONFIG="<config.h>")
+  include_directories(${TOP_SRC_DIR}/boost)
+  add_subdirectory(boost)
+endif()
+
 
-add_subdirectory(boost)
-add_subdirectory(intl)
+if(NOT use_external_libintl)
+  add_subdirectory(intl)
+endif()
 add_subdirectory(src)
 
-include(../Install)
+if(lyxinstall)
+       add_subdirectory(man)
+       if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
+               add_subdirectory(doc)
+       endif()
+endif()
+add_subdirectory(lyx2lyx)
+add_subdirectory(scripts)
+
+if(lyxinstall)
+       include(../Install)
+endif()
+
+SET(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")
+SET(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}")
+FILE(STRINGS "${TOP_SRC_DIR}/development/cmake/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY)
+
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}")
+#
+# needed by rpm
+SET(CPACK_SET_DESTDIR "ON")
+FILE(READ "${TOP_SRC_DIR}/development/cmake/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE)
+SET(CPACK_RPM_PACKAGE_GROUP "Applications/Publishing")
+SET(CPACK_RPM_PACKAGE_VENDOR "The LyX team")
+#
+# the next ones are needed by deb
+SET(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${project}-${LYX_INSTALL_SUFFIX}")
+
+# This is experimental, valid on _my_ system (Kornel)
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtgui4 (>= 4.4.3-0)")
+IF(ASPELL_FOUND)
+  SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libaspell15 (>= 0.60.6-1),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
+ENDIF()
+#
+# for the next ones, cpack insists on data with values in some file
+SET(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/development/cmake/LyX_description.txt")
+SET(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/development/cmake/LyX_license.txt")
+
+# Find the revision number and use it as the release in rpm-package-build.
+# This way we may omit the otherwise needed "--force" parameter when
+# installing from that rpm package.
+FIND_PROGRAM(_svnversion svnversion)
+message(STATUS "svnversion = ${_svnversion}")
+if(NOT ${_svnversion} MATCHES "-NOTFOUND")
+  EXECUTE_PROCESS(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+  # We use this value also to set the package-patch-value
+  if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)")
+    set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1})
+  endif()
+endif()
 
+# we do not have a readme or welcome data,
+# so we do not provide infofiles for
+# CPACK_RESOURCE_FILE_README and CPACK_RESOURCE_FILE_WELCOME
+
+if(lyxinstall)
+       include(CPack)
+endif()
+
+#Now it is possible to create some packages
+# cd <BuildDir>
+# make package
+#############################################################################################
+# So, e.g. for variables
+#    CMAKE_PROJECT_NAME                     : lyx
+#    CPACK_PACKAGE_VERSION_MAJOR            : 2
+#    CPACK_PACKAGE_VERSION_MINOR            : 0
+#    CPACK_PACKAGE_VERSION_PATCH            : 1
+#    CMAKE_SYSTEM_NAME                      : Linux
+#    CPACK_BINARY_DEB:BOOL                  : ON
+#
+# the package name builds as "lyx-2.0.1-Linux.deb"
+#
+############################## rpm ################################### deb ##################
+# create    # cpack -G RPM --config CPackConfig.cmake   # cpack -G DEB --config CPackConfig.cmake
+# creates =># lyx-2.0.1-Linux.rpm                       # lyx-2.0.1-Linux.deb
+# list      # rpm -qlp lyx-2.0.1-Linux.rpm              # dpkg-deb -c lyx-2.0.1-Linux.deb
+# install   # rpm -U lyx-2.0.1-Linux.rpm                # dpkg -i lyx-2.0.1-Linux.deb
+#