Yet more empty-->plain.

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 1a70bda6e69d4c8a4befb9d2fa42f02953fd46bf..b44bb70797aef92382ab2a80d65980b71d5a1bd9 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -6,6 +6,11 @@
 
 cmake_minimum_required(VERSION 2.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)
@@ -23,6 +28,8 @@ set(PACKAGE_VERSION 1.6svn)
 set(LYX_DATE "2007/2008")
 #TODO
 set(VERSION_INFO "CMake Build")
+set(LYX_DIR_VER "LYX_DIR_16x")
+set(LYX_USERDIR_VER "LYX_USERDIR_16x")
 
 set(PROGRAM_SUFFIX "")
 set(LYX_ABS_INSTALLED_DATADIR "/usr/local/share/lyx")
@@ -75,11 +82,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)
@@ -89,11 +99,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)
@@ -104,7 +116,11 @@ if(UNIX)
        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)
+       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()
 
@@ -122,12 +138,11 @@ else()
 endif()
 set(aspell)
 
-if(WIN32)
-       set(use_external_libintl TRUE)
-endif()
+set(use_external_libintl TRUE)
 
 if(use_external_libintl)
        find_package(Libintl REQUIRED)
+       add_definitions(-DHAVE_GETTEXT)
 endif()
 
 message("")
@@ -156,6 +171,13 @@ if(WIN32)
        else()
                message("----- 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()
+               add_definitions(-DWINVER=0x0500)
+       endif()
 endif()
 
 set(PROGRAM_SUFFIX "\"\"")
@@ -170,11 +192,6 @@ message("----- LYX_ABS_INSTALLED_DATADIR   : ${LYX_ABS_INSTALLED_DATADIR}")
 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)      
-       # 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>")
        
@@ -252,7 +269,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 "/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")
                
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
@@ -270,7 +287,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 "/wd4355 /wd4800 /wd4996 /wd4267 /wd4180")
+               set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4267 /wd4180")
                
                set(CMAKE_CXX_FLAGS_DEBUG
                        "${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
@@ -289,11 +306,11 @@ if(MSVC)
 endif()
 
 # compiler tests, config.h generation
-if(UNIX OR CONFIGURECHECKS)
+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)
-else()
-       configure_file(configCompiler.h.msvc ${CMAKE_BINARY_DIR}/configCompiler.h)
 endif()
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)