]> git.lyx.org Git - lyx.git/blobdiff - development/cmake/CMakeLists.txt
Removed _one_ perl-dependency in creating po-files.
[lyx.git] / development / cmake / CMakeLists.txt
index b3bcc12a0e6726487704666db44ef88756ae8ca0..2913288caa8fc0b24082309303379e6f30b36970 100644 (file)
@@ -1,24 +1,82 @@
+
 # 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)
+cmake_minimum_required(VERSION 2.6.4)
 
 if(COMMAND cmake_policy)
        cmake_policy(SET CMP0003 OLD)
        cmake_policy(SET CMP0005 OLD)
 endif(COMMAND cmake_policy)
 
-set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
-
 project(lyx)
 
-# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
-# is checked
+set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
+
+# where to look first for cmake modules,
+# before ${CMAKE_ROOT}/Modules is checked
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
+include(LyXMacros)
+
+message(STATUS)
+message(STATUS "Switch LYX_* variables by -DLYX_*=1 or 0:")
+
+# Usage LYX_OPTION
+# 1. parameter: option name without prefix 'LYX_'
+# 2. parameter: description
+# 3. parameter: default value, ON or OFF
+# 4. parameter: system on which option is used: ALL, GCC, MSVC, ...
+LYX_OPTION(NLS "Use nls" OFF ALL)
+LYX_OPTION(ASPELL "Require aspell" OFF ALL)
+LYX_OPTION(DEBUG "Build debug version" OFF ALL)
+LYX_OPTION(RELEASE "Build release version" ON ALL)
+LYX_OPTION(PROFILE "Build profile version" OFF GCC)
+LYX_OPTION(USE_EXTERNAL_BOOST "Use external boost" OFF GCC)
+LYX_OPTION(USE_EXTERNAL_LIBINTL "Use external libintl" ON ALL)
+LYX_OPTION(INSTALL "Build install projects/rules" ON ALL)
+LYX_OPTION(PACKAGE_SUFFIX "Use version suffix for packaging" OFF ALL)
+LYX_OPTION(PROGRAM_SUFFIX "Append version suffix to binaries" ON GCC)
+LYX_OPTION(NO_CONSOLE "Suppress console on Windows" OFF MSVC)
+LYX_OPTION(VLD "Use VLD with MSVC" OFF MSVC)
+LYX_OPTION(DISABLE_PCH "Disable precompiled headers" ON ALL)
+LYX_OPTION(MERGE_FILES "Merge source files into one compilation unit" OFF ALL)
+LYX_OPTION(DEBUG_GLIBC "Enable libstdc++ debug mode" OFF GCC)
+LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++pedantic debug mode" OFF GCC)
+LYX_OPTION(STDLIB_DEBUG "Use debug stdlib" OFF GCC)
+LYX_OPTION(CONCEPT_CHECKS "Enable concept-checks" OFF GCC)
+LYX_OPTION(QUIET "Don't generate verbose makefiles" OFF ALL)
+LYX_OPTION(SHARED_LIBRARIES "Build shared libraries" OFF ALL)
+
+message(STATUS)
+
 set(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
+set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
+
+
+
+if(UNIX OR MINGW)
+    execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
+    message(STATUS "Using GCC version ${GCC_VERSION}")
+    if(NOT GCC_VERSION VERSION_LESS 4.4)
+        set(LYX_USE_TR1 1)
+        # GCC <= 4.5 does not support regex: there are linker errors
+        # http://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#status.iso.tr1
+        set(LYX_USE_TR1_REGEX 0)        
+    endif()
+else()
+    if(MSVC10)
+        set(LYX_USE_TR1 1)
+        set(LYX_USE_TR1_REGEX 1)
+    endif()
+endif()
+
+
+
+
 
 # Supress regeneration
 set(CMAKE_SUPPRESS_REGENERATION TRUE)
@@ -65,16 +123,20 @@ foreach(_c_l ${_config_lines} )
   endif()
 endforeach(_c_l)
 
-if(UseVersionSuffix)
-  message(STATUS "-- Using versioned PACKAGE. Disable with -DUseVersionSuffix=0")
+
+if(LYX_PACKAGE_SUFFIX)
   set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
+else()  
+  set(PACKAGE ${PACKAGE_BASE})
+endif()
+
+if(LYX_PROGRAM_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)
@@ -89,9 +151,15 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   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}/${LYX_LOCALEDIR}")
+set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${DATA_SUBDIR}${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
 
@@ -103,68 +171,53 @@ endif()
 # lyx's source files
 set(LYX_CPP_FILES *.cpp)
 set(LYX_HPP_FILES *.h)
+set(LYX_MOC_FILES moc_*.cpp)
+
 
-include(LyXMacros)
 include(ProjectSourceGroup)
 
-if(merge OR merge_rebuild)
-       set(merge 1 CACHE TYPE STRING FORCE)
-       set(MERGE_FILES 1 CACHE TYPE STRING FORCE)
-       message(STATUS "")
-       message(STATUS "All *.cpp files of a project are merged into two files, disable with -Dmerge=0")
-       message(STATUS "")
-else()
-       set(merge 0 CACHE TYPE STRING FORCE)
-       set(MERGE_FILES 0 CACHE TYPE STRING FORCE)
-       message(STATUS "Enable merging files with -Dmerge=1")
+if(LYX_MERGE_FILES)
+       add_definitions(-DLYX_MERGED_BUILD)
 endif()
 
 
 set(CMAKE_BUILD_TYPE Release)
 
-if(profile)
+if(LYX_PROFILE)
        set(CMAKE_BUILD_TYPE Profile CACHE TYPE STRING FORCE)
        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg"
-           CACHE TYPE STRING FORCE)
-       set(profile)
+            CACHE TYPE STRING FORCE)
 endif()
 
-if(release)
+if(LYX_RELEASE)
        set(CMAKE_BUILD_TYPE Release CACHE TYPE STRING FORCE)
-       set(release TRUE CACHE TYPE STRING FORCE)
-       set(release)
 endif()
 
-if(debug)
+if(LYX_DEBUG)
        set(CMAKE_BUILD_TYPE Debug CACHE TYPE STRING FORCE)
-       set(debug TRUE CACHE TYPE STRING FORCE)
-       set(debug)
 endif()
 
-if(shared)
+
+
+if(LYX_SHARED_LIBRARIES)
        set(library_type SHARED)
-       message(STATUS "building shared libraries")
 else()
        set(library_type STATIC)
 endif()
 
 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)
+        if(NOT LYX_QUIET)
+                set(CMAKE_VERBOSE_MAKEFILE ON)
        endif()
        set(LYX_CXX_FLAGS -Wall)
-       if(stdlib-debug)
+        if(LYX_STDLIB_DEBUG)
                set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
        endif()
-       if(concept-checks)
+        if(LYX_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          "${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()
@@ -179,46 +232,64 @@ add_definitions(-DQT_NO_STL -DQT_NO_KEYWORDS)
 
 find_package(ZLIB REQUIRED)
 
-if(all OR aspell)
-       set(aspell TRUE CACHE TYPE STRING)
+if(LYX_ASPELL)
        find_package(ASPELL REQUIRED)
 else()
        find_package(ASPELL)
 endif()
-set(aspell)
 
-set(use_external_libintl TRUE)
 
-if(use_external_libintl)
+if(LYX_USE_EXTERNAL_LIBINTL)
        find_package(Libintl REQUIRED)
        add_definitions(-DHAVE_GETTEXT)
 endif()
 
-message(STATUS "")
-if(nls OR all)
-       set(nls TRUE CACHE TYPE STRING)
-       add_definitions(-DENABLE_NLS=1)
-       message(STATUS "----- Building with ENABLE_NLS")
+
+if(WIN32)
+  find_library(HUNSPELL_LIBRARY "libhunspell")
 else()
-       message(STATUS "----- No nls, to enable use -Dnls=1")
+  #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()
-set(nls)
+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()
+
+
+if(LYX_NLS)
+        add_definitions(-DENABLE_NLS=1)
+endif()
+
 if(ASPELL_FOUND)
        add_definitions(-DUSE_ASPELL=1)
-       message(STATUS "----- Building with USE_ASPELL")
-else()
-       message(STATUS "----- No aspell, to get more information use -Daspell=1")
 endif()
-set(all)
 
 if(WIN32)
-       if(noconsole)
-               set(noconsole TRUE CACHE TYPE STRING)
+        if(LYX_NO_CONSOLE)
                set(WIN32_CONSOLE WIN32)
                set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY})
-               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)
@@ -243,60 +314,55 @@ endforeach(_v)
 message(STATUS "")
 
 
-add_definitions(-DBOOST_USER_CONFIG="<config.h>")
-
-if(MSVC AND NOT disable-pch AND NOT MERGE_FILES)
-       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)
-       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)
-               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")
-else()
-       if(MSVC)
-               message(STATUS "-----")
-               message(STATUS "----- precompiled headers disabled, enable with -Ddisable-pch=0")
-               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(NOT LYX_DISABLE_PCH)
+
+       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()
-       set(disable-pch TRUE CACHE TYPE STRING)
+else()
+       set(LYX_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(vld)
-               set(vld 1 CACHE TYPE STRING FORCE)
+       if(LYX_VLD)
                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()
 
+        # TODO options
        if(WALL)
                set(WALL 1 CACHE TYPE STRING FORCE)
 
@@ -319,7 +385,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 "/wd4288 /wd4355 /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}")
@@ -337,7 +403,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 "/wd4288 /wd4355 /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}")
@@ -347,6 +413,12 @@ if(MSVC)
                        "${CMAKE_CXX_FLAGS_MINSIZEREL} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
 
        endif()
+       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}")
@@ -355,16 +427,24 @@ if(MSVC)
 
 endif()
 
-
 FIND_PROGRAM(_PERL_EXECUTABLE perl)
-if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
-    if(nls OR all)
+FIND_PROGRAM(_PYTHON_EXECUTABLE python)
+if( NOT ${_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
+    if(LYX_NLS)
       find_package(LyXGettext REQUIRED)
       include_directories(${TOP_SRC_DIR}/po)
       add_subdirectory(po)
     endif()
 endif()
 
+if(LYX_DEBUG_GLIBC)
+  set(_GLIBCXX_DEBUG 1)
+endif()
+
+if(LYX_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)
@@ -372,43 +452,57 @@ else()
        include(ConfigureChecks.cmake)
        configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h)
 endif()
-find_package(MyThesLIB)
-if(MYTHESLIB_FOUND)
-    # Variables in config.h will be set correctly with configure_file()
-    set(HAVE_LIBMYTHES 1)
-    set(MYTHES_H_LOCATION 1)
-else()
-  find_package(AiksaurusLIB)
-  if(AIKSAURUSLIB_FOUND)
-    # Variables in config.h will be set correctly with configure_file()
-    set(HAVE_LIBAIKSAURUS 1)
-    set(AIKSAURUS_H_LOCATION 1)
-  endif()
-endif()
+
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
 find_package(ICONV REQUIRED)
 add_definitions(-DHAVE_ICONV=1)
 
+
 include_directories(
-       ${CMAKE_BINARY_DIR}
-       ${TOP_SRC_DIR}/src
-       ${TOP_SRC_DIR}/boost)
+  ${CMAKE_BINARY_DIR}
+  ${TOP_SRC_DIR}/src)
+
+
+if(LYX_USE_EXTERNAL_BOOST)
+  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()
+  if(LYX_USE_TR1_REGEX)
+    set(Lyx_Boost_Libraries boost_signals)
+  else()
+    set(Lyx_Boost_Libraries boost_signals boost_regex)
+  endif()
+  add_definitions(-DBOOST_USER_CONFIG="<config.h>")
+  include_directories(${TOP_SRC_DIR}/boost)
+  add_subdirectory(boost)
+endif()
 
-add_subdirectory(boost)
-if(NOT use_external_libintl)
-       add_subdirectory(intl)
+
+if(NOT LYX_USE_EXTERNAL_LIBINTL)
+  add_subdirectory(intl)
 endif()
 add_subdirectory(src)
 
-add_subdirectory(man)
-if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
-    add_subdirectory(doc)
+if(LYX_INSTALL)
+       add_subdirectory(man)
+       if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
+               add_subdirectory(doc)
+       endif()
 endif()
 add_subdirectory(lyx2lyx)
 add_subdirectory(scripts)
 
-include(../Install)
+if(LYX_INSTALL)
+       include(../Install)
+endif()
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}")
@@ -439,10 +533,10 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/development/cmake/LyX_license.tx
 # 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)
+FIND_PROGRAM(LYX_SVNVERSION svnversion)
+#message(STATUS "svnversion = ${LYX_SVNVERSION}")
+if(NOT ${LYX_SVNVERSION} MATCHES "-NOTFOUND")
+  EXECUTE_PROCESS(COMMAND ${LYX_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})
@@ -453,7 +547,10 @@ endif()
 # so we do not provide infofiles for
 # CPACK_RESOURCE_FILE_README and CPACK_RESOURCE_FILE_WELCOME
 
-include(CPack)
+if(LYX_INSTALL)
+       include(CPack)
+endif()
+
 #Now it is possible to create some packages
 # cd <BuildDir>
 # make package
@@ -474,3 +571,4 @@ include(CPack)
 # 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
 #
+message(STATUS)