From 195bd0b0b1450596fd616c870cf792816c01c51b Mon Sep 17 00:00:00 2001 From: Stefan Schimanski Date: Thu, 24 May 2007 16:09:31 +0000 Subject: [PATCH] * force the tex2lyx Font class everywhere in tex2lyx. Without this in TextClass.cpp the tex2lyx Font class was used, but elsewhere the LyX one. Hence, because of different binary sizes strange segfaults happened because the inline methods of TextClass used a different binary layout than the non-inline methods. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18488 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/src/tex2lyx/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/development/cmake/src/tex2lyx/CMakeLists.txt b/development/cmake/src/tex2lyx/CMakeLists.txt index e99695137c..38fcc3e643 100644 --- a/development/cmake/src/tex2lyx/CMakeLists.txt +++ b/development/cmake/src/tex2lyx/CMakeLists.txt @@ -44,11 +44,11 @@ set(tex2lyx_headers include_directories(BEFORE ${TOP_SRC_DIR}/src/tex2lyx) if(MSVC) - SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/Layout.cpp ${TOP_SRC_DIR}/src/TextClass.cpp + SET_SOURCE_FILES_PROPERTIES(${tex2lyx_sources} ${LINKED_FILES} PROPERTIES COMPILE_FLAGS "/DFONT_H /FI${TOP_SRC_DIR}/src/tex2lyx/Font.h /FI${TOP_SRC_DIR}/src/tex2lyx/Spacing.h") else(MSVC) - SET_SOURCE_FILES_PROPERTIES(${TOP_SRC_DIR}/src/Layout.cpp ${TOP_SRC_DIR}/src/TextClass.cpp + SET_SOURCE_FILES_PROPERTIES(${tex2lyx_sources} ${LINKED_FILES} PROPERTIES COMPILE_FLAGS "-DFONT_H -include ${TOP_SRC_DIR}/src/tex2lyx/Font.h -include ${TOP_SRC_DIR}/src/tex2lyx/Spacing.h") endif(MSVC)