]> git.lyx.org Git - lyx.git/blobdiff - development/cmake/CMakeLists.txt
projects / lyx.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- German EmbeddedObjects.lyx: tiny beautification by Hartmut
[lyx.git] / development / cmake / CMakeLists.txt
diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 39b4bfdb60da2d26dc2d5df983d5b6eb888ce62b..60ce8b8e2723dfd2833e4b2e25b98af895e97d18 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -9,14 +9,19 @@
 
 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")
 set(EXECUTABLE_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/bin)
 
+# Supress regeneration
+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")
 
@@ -53,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)
@@ -106,7 +110,6 @@ if(UNIX)
 endif()
 
 
-project(lyx)
 find_package(Qt4 REQUIRED)
 add_definitions(-DQT_CLEAN_NAMESPACE -DQT_NO_STL -DQT_NO_KEYWORDS)
 
@@ -161,32 +164,65 @@ message("----- LYX_ABS_INSTALLED_LOCALEDIR : ${LYX_ABS_INSTALLED_LOCALEDIR}")
 message("")
 
 if(MSVC)
-       ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)      
+       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)
+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.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 COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch")
-               set(${name_}_sources ${${name_}_sources} ${CMAKE_BINARY_DIR}/config_pch.C ${CMAKE_BINARY_DIR}/pcheaders.h)
+               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")
+       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("-----")
+               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)
                
@@ -209,11 +245,14 @@ 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}")
-               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}")
+               set(CMAKE_CXX_FLAGS_DEBUG
+                       "${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
+               set(CMAKE_CXX_FLAGS_RELEASEs
+                       "${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()  
                set(WALL 0 CACHE TYPE STRING FORCE)
@@ -224,11 +263,14 @@ 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}")
-               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}")
+               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()
        
@@ -239,9 +281,15 @@ if(MSVC)
        
 endif()
 
-# create config.h
-include(ConfigureChecks.cmake)
-configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h )
+# 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)
@@ -254,9 +302,7 @@ configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in
 include_directories( 
        ${CMAKE_BINARY_DIR} 
        ${TOP_SRC_DIR}/src 
-       ${TOP_SRC_DIR}/boost 
-       ${QT_INCLUDES} 
-)
+       ${TOP_SRC_DIR}/boost)
 
 add_subdirectory(boost)
 add_subdirectory(intl)
The LyX Source Repository