Fix bug #7535 by adding a bounds check. There is still a problem here,

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1061c1bedc42b3c1c71625ed897e0def7fdd8642..4accace910fbe263fc05208478e6149e2ddc4c28 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -354,9 +354,12 @@ set(LYX_MOC_FILES moc_*.cpp)
 include(ProjectSourceGroup)
 
 
-if(LYX_PROFILE)
+if(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" CACHE TYPE STRING FORCE)
+       set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS}  -pg" CACHE TYPE STRING FORCE)
+else()
+       set(LYX_PROFILE OFF)
 endif()
 
 
@@ -364,9 +367,14 @@ 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)
@@ -399,7 +407,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()
 
 
@@ -618,8 +625,7 @@ 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_VERSIONNUM "${CMAKE_MATCH_1}*10000+${CMAKE_MATCH_2}*100+${CMAKE_MATCH_3}")
-       set(QT4_VERSION "0x${QT4_VERSIONNUM}")
+       MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
 endif()
 
 add_subdirectory(src "${TOP_BINARY_DIR}/src")