cmake: linux fixes

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

diff --git a/development/cmake/modules/FindASPELL.cmake b/development/cmake/modules/FindASPELL.cmake
index 8ec3ec79f18d866538671b221a7a78047681018d..c62a09a9c78b1eeb0232a9ec365945d94203e5a5 100644 (file)
--- a/development/cmake/modules/FindASPELL.cmake
+++ b/development/cmake/modules/FindASPELL.cmake
@@ -79,7 +79,7 @@ if(MSVC)
                endif()
        endif()
 else()
-       set(ASPELL_LIBRARY ${ASPELL_LIBRARY_RELEASE})
+       set(ASPELL_LIBRARY ${ASPELL_LIBRARY_RELEASE} CACHE STRING "Aspell library" FORCE)
 endif()
 
 if(ASPELL_INCLUDE_DIR AND ASPELL_LIBRARY)

diff --git a/development/cmake/src/CMakeLists.txt b/development/cmake/src/CMakeLists.txt
index bb0b9a874136c5314161deae3d94a2462cf7c783..a3ef642c16b7332341d0b9774e97ad3a434b1bfc 100644 (file)
--- a/development/cmake/src/CMakeLists.txt
+++ b/development/cmake/src/CMakeLists.txt
@@ -74,7 +74,9 @@ lyx_add_msvc_pch(lyx)
 
 
 if (LYX_MERGE_FILES)
-       list(REMOVE_ITEM lyx_sources ${dont_merge})
+       if(dont_merge)
+               list(REMOVE_ITEM lyx_sources ${dont_merge})
+       endif()
        lyx_const_touched_files(_allinone lyx_sources)
        set(lyx_sources ${_allinone_files} ${dont_merge})
 endif()