external_templates: correct program names

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2dce134c2f8335ca8942af7d3df0d94be3087cd..5e7c0a1af3e1b4e001d14d61d5b12502fe6e49df 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)
@@ -152,14 +153,14 @@ 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-x86.zip)
+       set(deps_files lyx20-deps-msvc2010.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)
                find_file(already_downloaded ${it} "${LYX_DEPENDENCIES_DIR}/download")
                if(NOT already_downloaded)
                        message(STATUS "Downloading ${it} ...")
-                       file(DOWNLOAD http://sourceforge.net/projects/scusi/files/${it} ${LYX_DEPENDENCIES_DIR}/download/${it} 
-                                     SHOW_PROGRESS STATUS status LOG log)
+                       file(DOWNLOAD ${deps_server}/${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)
@@ -361,10 +362,10 @@ set(LYX_MOC_FILES moc_*.cpp)
 include(ProjectSourceGroup)
 
 
-if(NOT MSVC)
+if(LYX_PROFILE AND NOT MSVC)
        set(CMAKE_BUILD_TYPE Profile CACHE TYPE STRING FORCE)
-       set(CMAKE_CXX_FLAGS_PROFILE "${CMAKE_CXX_FLAGS_RELEASE} -pg" 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()