make \lyxadded and \lyxdeleted robust (#8435)

[lyx.git] / src / CMakeLists.txt

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 57c418b2a3b739dea559f04e30de04dffac3ccac..dd9a3609abd62f5531b38630654e8d0b33bb1e86 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -31,15 +31,13 @@ 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)
@@ -90,16 +88,17 @@ if (LYX_VLD)
 endif()
 
 if(WIN32)
-       set(FILE_RC ${TOP_SRC_DIR}/development/cmake/lyx.rc)
+       set(FILE_RC ${TOP_CMAKE_PATH}/lyx.rc)
        message(STATUS "Using icon defined in resource file: ${FILE_RC}")
 endif()
 
 lyx_find_info_files(LyXInfoFiles ${TOP_SRC_DIR}/*)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.txt)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.cmake)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.h)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/*.msvc)
-lyx_find_info_files(LyXCMakeFiles ${TOP_SRC_DIR}/development/cmake/modules/*)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.txt)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.cmake)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.h)
+lyx_find_info_files(LyXCMakeFiles ${TOP_CMAKE_PATH}/*.msvc)
+lyx_find_info_files(LyXCMakeFiles ${TOP_MODULE_PATH}/*)
+lyx_find_info_files(LyXCMakeFiles ${TOP_SCRIPT_PATH}/*)
 lyx_find_info_files(LyXUiFiles ${TOP_SRC_DIR}/lib/ui/*)
 
 if (APPLE AND LYX_BUNDLE)
@@ -118,6 +117,7 @@ add_executable(${_lyx}
        ${OSX_BUNDLE_FILES}
 )
 
+add_dependencies(${_lyx} lyx_version)
 
 lyx_add_gcc_pch(${_lyx})
 
@@ -128,12 +128,11 @@ target_link_libraries(${_lyx}
        frontend_qt4
        graphics
        support
-       ${LIBINTL_LIBRARIES}
+       ${intl_link}
        ${ICONV_LIBRARY}
        ${QT_QTMAIN_LIBRARY}
        ${vld_dll})
 
-
 if(HUNSPELL_FOUND)
        target_link_libraries(${_lyx} ${HUNSPELL_LIBRARY})
 endif()