diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 696b0ead2c..d81639bb33 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -170,7 +170,7 @@ endif() project_source_group("${GROUP_CODE}" lyx_sources lyx_headers) -install(TARGETS ${_lyx} +install(TARGETS ${_lyx} BUNDLE DESTINATION . COMPONENT Runtime RUNTIME DESTINATION ${LYX_UTILITIES_INSTALL_PATH} COMPONENT Runtime) diff --git a/src/client/CMakeLists.txt b/src/client/CMakeLists.txt index 39af9965cf..95535e0a61 100644 --- a/src/client/CMakeLists.txt +++ b/src/client/CMakeLists.txt @@ -14,9 +14,9 @@ file(GLOB _lyxclient_headers ${TOP_SRC_DIR}/src/client/*.h) list(REMOVE_ITEM _lyxclient_headers "${TOP_SRC_DIR}/src/client/pch.h") list(REMOVE_ITEM _lyxclient_sources "${TOP_SRC_DIR}/src/client/lyxclient.cpp") -include_directories(BEFORE - "${TOP_SRC_DIR}/src/client" - "${TOP_SRC_DIR}/3rdparty/boost" +include_directories(BEFORE + "${TOP_SRC_DIR}/src/client" + "${TOP_SRC_DIR}/3rdparty/boost" ${ZLIB_INCLUDE_DIR}) add_executable(${_lyxclient} ${_lyxclient_sources} ${_lyxclient_headers}) diff --git a/src/frontends/CMakeLists.txt b/src/frontends/CMakeLists.txt index 78c310d31d..867b838c80 100644 --- a/src/frontends/CMakeLists.txt +++ b/src/frontends/CMakeLists.txt @@ -8,7 +8,7 @@ project(frontends) include_directories(${TOP_SRC_DIR}/src/frontends) -add_subdirectory(qt4) +add_subdirectory(qt4) file(GLOB frontends_sources ${TOP_SRC_DIR}/src/frontends/${LYX_CPP_FILES}) file(GLOB frontends_headers ${TOP_SRC_DIR}/src/frontends/${LYX_HPP_FILES}) diff --git a/src/support/CMakeLists.txt b/src/support/CMakeLists.txt index 06920ad0f3..3e9dac512b 100644 --- a/src/support/CMakeLists.txt +++ b/src/support/CMakeLists.txt @@ -21,7 +21,7 @@ file(GLOB support_headers ${TOP_SRC_DIR}/src/support/${LYX_HPP_FILES}) file(GLOB support_linkback_sources ${TOP_SRC_DIR}/src/support/linkback/*.m*) file(GLOB support_linkback_headers ${TOP_SRC_DIR}/src/support/linkback/*.h) -set_source_files_properties(${support_linkback_sources} +set_source_files_properties(${support_linkback_sources} ${TOP_SRC_DIR}/src/support/AppleSpeller.m ${TOP_SRC_DIR}/src/support/AppleScript.m PROPERTIES COMPILE_FLAGS "-std=c99") diff --git a/src/tex2lyx/TODO.txt b/src/tex2lyx/TODO.txt index 2c835dd64c..c448a45569 100644 --- a/src/tex2lyx/TODO.txt +++ b/src/tex2lyx/TODO.txt @@ -75,7 +75,7 @@ Format LaTeX feature LyX feature 459 beamer: \begin{frame}, \begin_layout Frame \begin{frame}[plain], \begin_layout PlainFrame \begin{frame}[fragile] \begin_layout FragileFrame -466 Powerdot updates: +466 Powerdot updates: \pause[] layout Pause \onslide{}{} InsetFlex, InsetArgument \onslide*{}{} InsetFlex, InsetArgument @@ -151,8 +151,8 @@ Format LaTeX feature LyX feature btprint "bibbysection" 534 Chapterbib support \usepackage{chapterbib} \multibib child - - + + General @@ -162,9 +162,9 @@ General * Store alias commands for characters in a file with "lib/unicodesymbols"-format, e.g. - + 0x200b "\\dots" "" "" "" # HORIZONTAL ELLIPSIS 0x200b "\\ldots" "" "" "\\ldots" # HORIZONTAL ELLIPSIS 0x200b "\\textellipsis" "" "" "" # HORIZONTAL ELLIPSIS - + Look up LaTeX->Unicode conversion in the combined files.