From 5c26b24d17b6b4199f9b085bed93f7d63253a666 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Mon, 23 Oct 2006 14:32:12 +0000 Subject: [PATCH] fix wrong usage of precompiled headers, now it's really faster, more to come git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15509 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 6 +- development/cmake/config.C.cmake | 431 ------------------------------- development/cmake/config.h.cmake | 3 + development/cmake/pcheaders.h | 187 ++++++++++++++ 4 files changed, 194 insertions(+), 433 deletions(-) create mode 100644 development/cmake/pcheaders.h diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 92575272d3..4512ec7094 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -100,14 +100,16 @@ if(pch AND MSVC) macro(lyx_add_msvc_pch _sources) SET_SOURCE_FILES_PROPERTIES(${${_sources}} PROPERTIES COMPILE_FLAGS "/Yuconfig.h /Fp${CMAKE_BINARY_DIR}/config.pch /Fd${CMAKE_BINARY_DIR}/pchlib.pdb") + add_definitions(-DLYX_PRECOMPILED_HEADERS) endmacro(lyx_add_msvc_pch) configure_file(config.C.cmake ${CMAKE_BINARY_DIR}/config.C) + configure_file(pcheaders.h ${CMAKE_BINARY_DIR}/pcheaders.h) SET_SOURCE_FILES_PROPERTIES(${CMAKE_BINARY_DIR}/config.C PROPERTIES COMPILE_FLAGS - "/Ycconfig.h /Fp${CMAKE_BINARY_DIR}/config.pch /Fd${CMAKE_BINARY_DIR}/pchlib.pdb") + "/Ycconfig.h /Fp${CMAKE_BINARY_DIR}/config.pch /Fd${CMAKE_BINARY_DIR}/pchlib.pdb -DLYX_PRECOMPILED_HEADERS") include_directories(${CMAKE_CURRENT_BINARY_DIR} ${TOP_SRC_DIR}/src/support ${ICONV_INCLUDE_DIR}) - add_library(pchlib STATIC ${CMAKE_BINARY_DIR}/config.C) + add_library(pchlib STATIC ${CMAKE_BINARY_DIR}/config.C ${CMAKE_BINARY_DIR}/pcheaders.h) set(pchlibname pchlib ) set(PRECOMPILED_HEADERS TRUE) diff --git a/development/cmake/config.C.cmake b/development/cmake/config.C.cmake index e7f0b9ebd2..bf34c0929b 100644 --- a/development/cmake/config.C.cmake +++ b/development/cmake/config.C.cmake @@ -10,434 +10,3 @@ */ #include - -//#define LYX_DONT_PRECOMPILE_SRC -//#define LYX_DONT_PRECOMPILE_SUPPORT -//#define LYX_DONT_PRECOMPILE_INSETS -//#define LYX_DONT_PRECOMPILE_MATHED -//#define LYX_DONT_PRECOMPILE_FRONTENDS -//#define LYX_DONT_PRECOMPILE_CONTROLLERS - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if BOOST_VERSION < 103300 -# include -#else -# include -#endif - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#ifndef LYX_DONT_PRECOMPILE_SRC -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#ifndef LYX_DONT_PRECOMPILE_SUPPORT -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - - -#ifndef LYX_DONT_PRECOMPILE_INSETS -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#ifndef LYX_DONT_PRECOMPILE_MATHED -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - - -#ifndef LYX_DONT_PRECOMPILE_FRONTENDS -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#endif - -#ifndef LYX_DONT_PRECOMPILE_CONTROLLERS -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -//#include -#include -#include -#include -#include -#endif - diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake index e12a33c3c2..d96187cdb5 100644 --- a/development/cmake/config.h.cmake +++ b/development/cmake/config.h.cmake @@ -167,5 +167,8 @@ #pragma warning( disable : 4800 ) //: forcing value to bool 'true' or 'false' (performance warning) #endif +#ifdef LYX_PRECOMPILED_HEADERS +#include "pcheaders.h" +#endif #endif diff --git a/development/cmake/pcheaders.h b/development/cmake/pcheaders.h new file mode 100644 index 0000000000..2a588e7dd5 --- /dev/null +++ b/development/cmake/pcheaders.h @@ -0,0 +1,187 @@ +/* + * \file pcheader.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * This is the compilation configuration file for LyX. + * It was generated by autoconfs configure. + * You might want to change some of the defaults if something goes wrong + * during the compilation. + */ + + +//#define LYX_DONT_PRECOMPILE_SRC + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if BOOST_VERSION < 103300 +# include +#else +# include +#endif + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifndef LYX_DONT_PRECOMPILE_SRC +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif -- 2.39.2