From 745c9e91fd7a96f2fabd6b4915cdcb51f6783951 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
Date: Sun, 25 Mar 2007 22:03:59 +0000
Subject: [PATCH] cmake:  - add flags for debug/release/profile  - also build
 qt4 as one file with gcc

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@17558 a592a061-630c-0410-9148-cb99ea01b6c8
---
 development/cmake/CMakeLists.txt              | 32 +++++++++++++++++--
 development/cmake/src/CMakeLists.txt          |  4 ++-
 .../cmake/src/frontends/qt4/CMakeLists.txt    | 11 +++++--
 src/frontends/qt4/GuiFontLoader.C             |  2 +-
 4 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 169a3b883b..b09b6adb04 100644
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -42,10 +42,34 @@ if(merge OR MERGE_FILES)
 	message(STATUS "")
 endif(merge OR MERGE_FILES)	
 
+
+set(CMAKE_BUILD_TYPE)
+if(profile)
+	set(CMAKE_BUILD_TYPE Profile)
+	set(profile)
+endif(profile)
 if(release)
 	set(CMAKE_BUILD_TYPE Release)
 	set(release)
-endif(release)	
+endif(release)
+if(debug)
+	set(CMAKE_BUILD_TYPE Debug)
+endif(debug)
+
+
+if(UNIX)
+	set(LYX_CXX_FLAGS -Wall)
+	if(stdlib-debug)
+		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
+	endif(stdlib-debug)
+	if(concept-checks)
+		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
+	endif(concept-checks)
+	set(CMAKE_CXX_FLAGS          "${LYX_CXX_FLAGS}" CACHE TYPE STRING FORCE)
+	set(CMAKE_CXX_FLAGS_DEBUG    "${LYX_CXX_FLAGS} -O -g -D_DEBUG" CACHE TYPE STRING FORCE)
+	set(CMAKE_CXX_FLAGS_RELEASE  "${LYX_CXX_FLAGS} -O3 -DNDEBUG" CACHE TYPE STRING FORCE)
+	set(CMAKE_CXX_FLAGS_PROFILE  "${CMAKE_CXX_FLAGS_RELEASE} -pg" CACHE TYPE STRING FORCE)
+endif(UNIX)
 
 
 set(qt_postfix qt4)
@@ -57,8 +81,6 @@ if(MERGE_FILES)
 endif(MERGE_FILES)
 
 find_package(ZLIB REQUIRED)
-find_package(ICONV REQUIRED)
-add_definitions(-DHAVE_ICONV=1)
 
 if(all OR aspell)
 	set(aspell TRUE CACHE TYPE STRING)
@@ -196,6 +218,10 @@ endif(MSVC)
 include(ConfigureChecks.cmake)
 configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h )
 
+find_package(ICONV REQUIRED)
+add_definitions(-DHAVE_ICONV=1)
+
+
 #TODO: insource is not the best place
 configure_file(${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py.in 
                ${TOP_SRC_DIR}/lib/lyx2lyx/lyx2lyx_version.py)
diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index 52c0c2327c..a0e70e45f2 100644
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -13,7 +13,9 @@ add_subdirectory(graphics)
 add_subdirectory(insets) 
 add_subdirectory(mathed) 
 add_subdirectory(support) 
-add_subdirectory(tex2lyx) 
+if(NOT MERGE_FILES)
+	add_subdirectory(tex2lyx) 
+endif(NOT MERGE_FILES)
 
 
 configure_file(${TOP_SRC_DIR}/src/version.C.in ${CMAKE_CURRENT_BINARY_DIR}/version.C)
diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt
index 89462034df..659881d3e1 100644
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -31,7 +31,12 @@ include_directories(
 			${TOP_SRC_DIR}/src/frontends/controllers
 			${CMAKE_CURRENT_BINARY_DIR})
 
-if(MERGE_FILES AND MSVC)
+if(MERGE_FILES)
+	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.C)
+	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/QCommandEdit.C)
+	list(REVERSE frontends_qt4_sources)
+	list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.C)
+	list(APPEND frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/GuiApplication.C)
 	lyx_merge_files(allinone frontends_qt4_sources)
 	set(depends_moc_uic ${frontends_qt4_headers} ${ui_files})
 	SET_SOURCE_FILES_PROPERTIES(allinone_const.C PROPERTIES OBJECT_DEPENDS "${depends_moc_uic}")
@@ -43,9 +48,9 @@ if(MERGE_FILES AND MSVC)
 					${frontends_qt4_headers} 
 					${ui_files}
 	)
-else(MERGE_FILES AND MSVC)	
+else(MERGE_FILES)	
 	add_library(frontend_qt4 STATIC ${frontends_qt4_sources} ${frontends_qt4_headers} ${ui_files})
-endif(MERGE_FILES AND MSVC)
+endif(MERGE_FILES)
 
 target_link_libraries(frontend_qt4 ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} controllers)
 
diff --git a/src/frontends/qt4/GuiFontLoader.C b/src/frontends/qt4/GuiFontLoader.C
index ac0819bafe..59a14bcb5f 100644
--- a/src/frontends/qt4/GuiFontLoader.C
+++ b/src/frontends/qt4/GuiFontLoader.C
@@ -28,7 +28,7 @@
 
 #ifdef Q_WS_X11
 #include <qwidget.h>
-#include <X11/Xlib.h>
+//#include <X11/Xlib.h>
 #include <algorithm>
 #endif
 
-- 
2.39.5