Remove unused libreoffice2eps.py script.

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e7c0a1af3e1b4e001d14d61d5b12502fe6e49df..ae43c8933de56959bb0ab5da0657ebcc093c4a96 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -100,7 +100,7 @@ LYX_OPTION(CONCEPT_CHECKS       "Enable concept-checks" OFF GCC)
 LYX_OPTION(PROFILE              "Build with options for gprof" OFF GCC)
 
 # MSVC specific
-LYX_OPTION(CONSOLE               "Show console on Windows" ON MSVC)
+LYX_OPTION(CONSOLE               "Show console on Windows, enforce with =FORCE" ON MSVC)
 LYX_OPTION(VLD                   "Use VLD with MSVC" OFF MSVC)
 LYX_OPTION(WALL                  "Enable all warnings" OFF MSVC)
 LYX_OPTION(CONFIGURE_CHECKS      "Also run configure checks for MSVC" OFF MSVC)
@@ -136,7 +136,11 @@ if(LYX_INSTALL)
        if (WIN32)
                set(LYX_HUNSPELL ON)
        endif()
-       set(LYX_CONSOLE OFF)
+       if(LYX_CONSOLE MATCHES "FORCE")
+               set(LYX_CONSOLE ON)
+       else()
+               set(LYX_CONSOLE OFF)
+       endif()
        set(LYX_PACKAGE_SUFFIX ON)
        set(LYX_RELEASE ON)
        set(LYX_PROFILE OFF)
@@ -153,7 +157,7 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
        message(STATUS)
        set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps)
        message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}")
-       set(deps_files lyx20-deps-msvc2010.zip)
+       set(deps_files lyx20-deps-msvc2010-x86.zip)
        set(deps_server http://downloads.sourceforge.net/project/lyx/Win_installers/Dependencies)
        foreach(it ${deps_files})
                set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE)
@@ -439,7 +443,7 @@ if(LYX_HUNSPELL)
 endif()
 
 if(LYX_NLS)
-       FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python HINTS ${GNUWIN32_DIR}/python)
+       FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python2 python HINTS ${GNUWIN32_DIR}/python)
        if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
                message(FATAL_ERROR "Python 2.6 needed!")
        endif()
@@ -621,6 +625,21 @@ if(LYX_DEBUG_GLIBC_PEDANTIC)
        set(_GLIBCXX_DEBUG_PEDANTIC ON)
 endif()
 
+# Xcode compiler
+if (CMAKE_GENERATOR MATCHES Xcode)
+       # Automatically select the Xcode compiler if not set
+       if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
+               # XCode >= 3.1 has gcc 4.2 (up to actual Xcode)
+               if (XCODE_VERSION VERSION_GREATER "3.1")
+                       SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+               ENDIF(XCODE_VERSION VERSION_GREATER "3.1")
+       ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
+
+       # Print the selected compiler version
+    MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
+ENDIF(CMAKE_GENERATOR MATCHES Xcode)
+
+
 # compiler tests, config.h generation
 if(MSVC AND NOT LYX_CONFIGURE_CHECKS)
        configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h)