From e93c2e656cf3084384925b40b82233fb7f1de15a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Tue, 13 Jul 2010 09:04:17 +0000 Subject: [PATCH] cmake: also build the tarball with its additional files git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@34885 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 2 +- development/cmake/src/CMakeLists.txt | 5 ++++- development/cmake/src/client/CMakeLists.txt | 2 ++ development/cmake/src/frontends/qt4/CMakeLists.txt | 8 +++++--- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 767c9ba3da..5a062986a0 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -147,7 +147,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) endif() if(WIN32) 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(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt index c17818f29c..e457885eca 100644 --- a/development/cmake/src/CMakeLists.txt +++ b/development/cmake/src/CMakeLists.txt @@ -26,7 +26,10 @@ list(REMOVE_ITEM lyx_sources ${TOP_SRC_DIR}/src/PSpell.cpp ${TOP_SRC_DIR}/src/ISpell.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/lyxinsets.cpp + ${TOP_SRC_DIR}/src/lyxmathed.cpp) if (ASPELL_FOUND) include_directories(${ASPELL_INCLUDE_DIR}) diff --git a/development/cmake/src/client/CMakeLists.txt b/development/cmake/src/client/CMakeLists.txt index 8df2da675b..1ed547918e 100644 --- a/development/cmake/src/client/CMakeLists.txt +++ b/development/cmake/src/client/CMakeLists.txt @@ -10,7 +10,9 @@ project(${_lyxclient}) file(GLOB _lyxclient_sources ${TOP_SRC_DIR}/src/client/*.cpp) 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}/boost" ${ZLIB_INCLUDE_DIR}) diff --git a/development/cmake/src/frontends/qt4/CMakeLists.txt b/development/cmake/src/frontends/qt4/CMakeLists.txt index fbd16b9691..52ec28a285 100644 --- a/development/cmake/src/frontends/qt4/CMakeLists.txt +++ b/development/cmake/src/frontends/qt4/CMakeLists.txt @@ -6,17 +6,19 @@ project(frontend_qt4) -file(GLOB frontends_qt4_sources - ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES}) +file(GLOB frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_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 ${TOP_SRC_DIR}/src/frontends/qt4/liblyxqt4.cpp) +list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src//src/frontends/qt4/Resources.cpp) + file(GLOB frontends_qt4_headers ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES}) file(GLOB frontend_qt4_UI ${TOP_SRC_DIR}/src/frontends/qt4/ui/*.ui) - + lyx_add_msvc_pch(frontends_qt4) lyx_automoc(${frontends_qt4_sources})