anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: sync with branch

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34887 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-07-13 09:39:05 +00:00
parent 47db764ccc
commit 264ba86334
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
development/cmake/CMakeLists.txt
View File

@ -151,7 +151,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
endif() endif()
if(WIN32) if(WIN32)
SET(CMAKE_INSTALL_PREFIX SET(CMAKE_INSTALL_PREFIX
${CMAKE_INSTALL_PREFIX}/${LYX_INSTALL_SUFFIX} CACHE PATH "LyX install prefix" FORCE) ${CMAKE_BINARY_DIR}/LYX_INSTALLED CACHE PATH "LyX install prefix" FORCE)
endif() endif()
endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

4
development/cmake/src/CMakeLists.txt
View File

@ -30,7 +30,9 @@ list(REMOVE_ITEM lyx_sources
${TOP_SRC_DIR}/src/HunspellChecker.cpp ${TOP_SRC_DIR}/src/HunspellChecker.cpp
${TOP_SRC_DIR}/src/Variables.cpp ${TOP_SRC_DIR}/src/Variables.cpp
${TOP_SRC_DIR}/src/Section.cpp ${TOP_SRC_DIR}/src/Section.cpp
${TOP_SRC_DIR}/src/lyxcore.cpp) ${TOP_SRC_DIR}/src/lyxcore.cpp
${TOP_SRC_DIR}/src/lyxinsets.cpp
${TOP_SRC_DIR}/src/lyxmathed.cpp)
if(NOT APPLE) if(NOT APPLE)
list(REMOVE_ITEM lyx_sources list(REMOVE_ITEM lyx_sources

2
development/cmake/src/client/CMakeLists.txt
View File

@ -10,7 +10,9 @@ project(${_lyxclient})
file(GLOB _lyxclient_sources ${TOP_SRC_DIR}/src/client/*.cpp) file(GLOB _lyxclient_sources ${TOP_SRC_DIR}/src/client/*.cpp)
file(GLOB _lyxclient_headers ${TOP_SRC_DIR}/src/client/*.h) 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_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" include_directories(BEFORE "${TOP_SRC_DIR}/src/client"
"${TOP_SRC_DIR}/boost" ${ZLIB_INCLUDE_DIR}) "${TOP_SRC_DIR}/boost" ${ZLIB_INCLUDE_DIR})

2
development/cmake/src/frontends/qt4/CMakeLists.txt
View File

@ -9,8 +9,10 @@ project(frontend_qt4)
file(GLOB frontends_qt4_sources file(GLOB frontends_qt4_sources
${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES}) ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_MOC_FILES}) file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_MOC_FILES})
list(REMOVE_ITEM frontends_qt4_sources ${moc_files} .) list(REMOVE_ITEM frontends_qt4_sources ${moc_files} .)
list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/liblyxqt4.cpp) list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/liblyxqt4.cpp)
list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/Resources.cpp)
file(GLOB frontends_qt4_headers file(GLOB frontends_qt4_headers
${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES}) ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})