updated list of installer files

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index fee65e9d0486bac0ea95d510ab7211635abed89d..893d11a5b78f45fc6da1f7dc012fb98b9c10e953 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)
@@ -75,11 +80,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)
@@ -106,7 +114,11 @@ if(NOT MSVC)
        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()
 
@@ -130,6 +142,7 @@ endif()
 
 if(use_external_libintl)
        find_package(Libintl REQUIRED)
+       add_definitions(-DHAVE_GETTEXT)
 endif()
 
 message("")
@@ -158,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 "\"\"")
@@ -172,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>")