From 19c3bff28178b1ac5a3b738df7c5675ddd1254e5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sat, 17 Jul 2010 23:12:50 +0000 Subject: [PATCH] cmake: linux fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34956 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/modules/FindASPELL.cmake | 2 +- development/cmake/src/CMakeLists.txt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/development/cmake/modules/FindASPELL.cmake b/development/cmake/modules/FindASPELL.cmake index 8ec3ec79f1..c62a09a9c7 100644 --- 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 bb0b9a8741..a3ef642c16 100644 --- 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() -- 2.39.2