Cmake build:

Partially revert 75d63ad1f2b5f29ededc128f169e8e11b5825b55
It caused recompiling everything at each commit.
Now use definition of LYX_DATE only when compiling version.cpp

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index cec1d0e3f7602766f30274a9e76f4f34b32ef41d..a579dedc17397bf22580a93bda78073a68bb9164 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -34,7 +34,6 @@
 #cmakedefine PACKAGE_VERSION "${PACKAGE_VERSION}"
 #define PACKAGE_STRING "LyX ${PACKAGE_VERSION}"
 #cmakedefine PACKAGE_BUGREPORT "${PACKAGE_BUGREPORT}"
-#cmakedefine LYX_DATE "${LYX_DATE}"
 #cmakedefine VERSION_INFO "${VERSION_INFO}"
 #cmakedefine LYX_DIR_VER "${LYX_DIR_VER}"
 #cmakedefine LYX_USERDIR_VER "${LYX_USERDIR_VER}"

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 5862136f017521e36c8bd68b13f6eab9e7a13300..57c418b2a3b739dea559f04e30de04dffac3ccac 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,13 +31,15 @@ list(REMOVE_ITEM lyx_sources
        ${TOP_SRC_DIR}/src/lyxinsets.cpp
        ${TOP_SRC_DIR}/src/lyxmathed.cpp)
 
+set_property(SOURCE "${TOP_SRC_DIR}/src/version.cpp" APPEND PROPERTY COMPILE_DEFINITIONS  LYX_DATE="${LYX_DATE}")
+
 list(REMOVE_ITEM lyx_headers
        ${TOP_SRC_DIR}/src/Variables.h
        ${TOP_SRC_DIR}/src/Section.h)
 
 if(NOT APPLE)
        list(REMOVE_ITEM lyx_sources ${TOP_SRC_DIR}/src/AppleSpellChecker.cpp)
-       list(REMOVE_ITEM lyx_headers ${TOP_SRC_DIR}/src/AppleSpellChecker.h)
+
 endif()
 
 if(NOT ASPELL_FOUND)

diff --git a/src/tex2lyx/CMakeLists.txt b/src/tex2lyx/CMakeLists.txt
index 1952a81251ba7410e78e63759d652e844149ed99..4fa809a395394d607322efce024abcdf5919559d 100644 (file)
--- a/src/tex2lyx/CMakeLists.txt
+++ b/src/tex2lyx/CMakeLists.txt
@@ -21,6 +21,8 @@ foreach(_src graphics/GraphicsParams insets/ExternalTemplate
        list(APPEND LINKED_headers ${TOP_SRC_DIR}/src/${_src}.h)
 endforeach(_src)
 
+set_property(SOURCE "${TOP_SRC_DIR}/src/version.cpp" APPEND PROPERTY COMPILE_DEFINITIONS  LYX_DATE="${LYX_DATE}")
+
 file(GLOB tex2lyx_sources ${TOP_SRC_DIR}/src/tex2lyx/${LYX_CPP_FILES})
 
 file(GLOB tex2lyx_headers ${TOP_SRC_DIR}/src/tex2lyx/${LYX_HPP_FILES})