Author: kuemmel
Date: Sat Jun 11 10:54:27 2011
New Revision: 39000
URL: http://www.lyx.org/trac/changeset/39000
Log:
cmake: don't overwrite profiling option
Modified:
lyx-devel/trunk/CMakeLists.txt
Modified: lyx-devel/trunk/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/CMakeLists.txt Fri Jun 10 18:25:59 2011 (r38999)
+++ lyx-devel/trunk/CMakeLists.txt Sat Jun 11 10:54:27 2011 (r39000)
@@ -354,9 +354,12 @@
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 @@
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 @@
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()
