cmake: linux fixes

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34956 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-07-17 23:12:50 +00:00
parent 0d386d7c25
commit 19c3bff281
2 changed files with 4 additions and 2 deletions

View File

@ -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)

View File

@ -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()