Pass the encoding to the japanese pLaTeX processor (#4697).

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index af0ac0f0115d281a3e030ef4536e80c1c461e6ec..bcdff225ed04af6128e412f97c0215bd1aeb2132 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -97,6 +97,7 @@ 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(PROFILE              "Build with options for gprof" OFF GCC)
 
 # MSVC specific
 LYX_OPTION(CONSOLE               "Show console on Windows" ON MSVC)
@@ -158,7 +159,14 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
                find_file(already_downloaded ${it} "${LYX_DEPENDENCIES_DIR}/download")
                if(NOT already_downloaded)
                        message(STATUS "Downloading ${it} ...")
-                       file(DOWNLOAD ftp://ftp.devel.lyx.org/pub/contrib/windows/${it} ${LYX_DEPENDENCIES_DIR}/download/${it} SHOW_PROGRESS)
+                       file(DOWNLOAD http://sourceforge.net/projects/scusi/files/${it} ${LYX_DEPENDENCIES_DIR}/download/${it} 
+                                     SHOW_PROGRESS STATUS status LOG log)
+                       list(GET status 0 status_code)
+                       list(GET status 1 status_string)
+                       if(NOT status_code EQUAL 0)
+                               file(REMOVE ${LYX_DEPENDENCIES_DIR}/${it})
+                               message(FATAL_ERROR "error: downloading '${it}' failed. status_code: ${status_code}, status_string: ${status_string}. \nLog: ${log} ")
+                       endif()
                        execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${LYX_DEPENDENCIES_DIR}/download/${it}
                                      WORKING_DIRECTORY ${LYX_DEPENDENCIES_DIR})
                endif()
@@ -354,9 +362,12 @@ set(LYX_MOC_FILES moc_*.cpp)
 include(ProjectSourceGroup)
 
 
-if(LYX_PROFILE)
+if(LYX_PROFILE AND NOT MSVC)
        set(CMAKE_BUILD_TYPE Profile CACHE TYPE STRING FORCE)
-       set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pg" CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -pg")
+       set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS}  -pg")
+else()
+       set(LYX_PROFILE OFF)
 endif()
 
 
@@ -364,11 +375,17 @@ if(LYX_NO_OPTIMIZE)
        set(CMAKE_BUILD_TYPE None)
        set(LYX_DEBUG OFF)
        set(LYX_RELEASE OFF)
+       set(LYX_PROFILE OFF)
 elseif(LYX_RELEASE)
        set(CMAKE_BUILD_TYPE Release)
        set(LYX_DEBUG OFF)
+       set(LYX_PROFILE OFF)
+elseif(LYX_PROFILE)
+       set(CMAKE_BUILD_TYPE Profile)
+       set(LYX_DEBUG OFF)
 else()
        set(CMAKE_BUILD_TYPE Debug)
+       set(LYX_DEBUG ON)
 endif()
 
 
@@ -398,7 +415,6 @@ if(NOT MSVC)
        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()
 
 
@@ -615,6 +631,10 @@ endif()
 
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
 
+# Compute qt4-version from ${QTVERSION}
+if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
+       MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
+endif()
 
 add_subdirectory(src "${TOP_BINARY_DIR}/src")
 add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")