The branch, kill-tex2lyx-define, has been updated. - Log -----------------------------------------------------------------
commit 5f3a49b252c2668228f46dbabeb7b7edcdb4dbf2 Author: Stephan Witt <[email protected]> Date: Fri Sep 27 20:35:40 2013 +0200 remove unused includes diff --git a/src/BufferEncoding.cpp b/src/BufferEncoding.cpp index 4725886..1a527ee 100644 --- a/src/BufferEncoding.cpp +++ b/src/BufferEncoding.cpp @@ -16,18 +16,10 @@ #include "BufferEncoding.h" #include "Buffer.h" -#include "BufferList.h" #include "InsetIterator.h" #include "LaTeXFeatures.h" -#include "Lexer.h" -#include "LyXRC.h" -#include "support/debug.h" -#include "support/gettext.h" -#include "support/FileName.h" #include "support/lstrings.h" -#include "support/textutils.h" -#include "support/unicode.h" #include <boost/cstdint.hpp> diff --git a/src/Encoding.cpp b/src/Encoding.cpp index 68d7e01..4afe853 100644 --- a/src/Encoding.cpp +++ b/src/Encoding.cpp @@ -14,12 +14,7 @@ #include "Encoding.h" -#include "Buffer.h" -#include "BufferList.h" -#include "InsetIterator.h" -#include "LaTeXFeatures.h" #include "Lexer.h" -#include "LyXRC.h" #include "support/debug.h" #include "support/gettext.h" commit 275c1945041a13db60a33348c8e1954ffd10bf0f Author: Stephan Witt <[email protected]> Date: Fri Sep 27 20:29:44 2013 +0200 use com.apple.compilers.llvm.clang.1_0 for newer Xcode versions diff --git a/CMakeLists.txt b/CMakeLists.txt index d0fa522..9117152 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -693,10 +693,14 @@ if (CMAKE_GENERATOR MATCHES Xcode) # Automatically select the Xcode compiler if not set if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) # XCode >= 3.1 has gcc 4.2 (up to actual Xcode) - if (XCODE_VERSION VERSION_GREATER "3.1") - SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") - ENDIF(XCODE_VERSION VERSION_GREATER "3.1") - ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) + if (XCODE_VERSION VERSION_GREATER "4.5") + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvm.clang.1_0") + else() + if (XCODE_VERSION VERSION_GREATER "3.1") + set(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42") + endif(XCODE_VERSION VERSION_GREATER "3.1") + endif(XCODE_VERSION VERSION_GREATER "4.5") + endif(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION) # Print the selected compiler version MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}") ----------------------------------------------------------------------- Summary of changes: CMakeLists.txt | 12 ++++++++---- src/BufferEncoding.cpp | 8 -------- src/Encoding.cpp | 5 ----- 3 files changed, 8 insertions(+), 17 deletions(-) hooks/post-receive -- Repository for new features
