cmake: sync with branch

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34887 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 6b4ff0570cea7294b5b2788403f0ff1398300680..a8dae749105d1a45831b3398da27e78ff398f799 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -151,7 +151,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 b19f21ab19f7fa690838577d6c54b1c09143afdc..3e1bd1ffd5730a43dce8f83093e16d5ec184dfe0 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -30,7 +30,9 @@ list(REMOVE_ITEM lyx_sources
        ${TOP_SRC_DIR}/src/HunspellChecker.cpp
        ${TOP_SRC_DIR}/src/Variables.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)
   list(REMOVE_ITEM lyx_sources

diff --git a/development/cmake/src/client/CMakeLists.txt b/development/cmake/src/client/CMakeLists.txt
index 8df2da675bbd4607dcc280cd3de7349f3921c255..1ed547918e019d86de9a33f8b213914b6dc42bd2 100644 (file)
--- 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 fbd16b96911536c9956a0d46b2469f1a74055b1c..e0553a161108e3ad3f9c930ad5e5b3fbd9da3648 100644 (file)
--- a/development/cmake/src/frontends/qt4/CMakeLists.txt
+++ b/development/cmake/src/frontends/qt4/CMakeLists.txt
@@ -9,8 +9,10 @@ project(frontend_qt4)
 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/frontends/qt4/Resources.cpp)
 
 file(GLOB frontends_qt4_headers
        ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})