Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / development / cmake / modules / FindASPELL.cmake

diff --git a/development/cmake/modules/FindASPELL.cmake b/development/cmake/modules/FindASPELL.cmake
index 9606f1f754c5b17c0ee2a2f4814c59b1b7fa8ff9..6054d6adfe2ab6939c6743481b9f579b07ba2f23 100644 (file)
--- a/development/cmake/modules/FindASPELL.cmake
+++ b/development/cmake/modules/FindASPELL.cmake
@@ -52,15 +52,14 @@ FIND_PATH(ASPELL_INCLUDE_DIR aspell.h
        ${_program_FILES_DIR}/gnuwin32/include
 )
 
-FIND_LIBRARY(ASPELL_LIBRARY_RELEASE NAMES aspell aspell-15 libaspell
+FIND_LIBRARY(ASPELL_LIBRARY_RELEASE NAMES aspell aspell-15 libaspell libaspell-15
        PATHS
-       /usr/lib
-       /usr/local/lib
+       ${SYSTEM_LIB_DIRS}
 )
 
 # msvc makes a difference between debug and release
 if(MSVC)
-       find_library(ASPELL_LIBRARY_DEBUG NAMES aspelld libaspelld
+       find_library(ASPELL_LIBRARY_DEBUG NAMES aspelld libaspelld libaspell-15
                 PATHS 
                 ${_program_FILES_DIR}/kdewin32/lib)
                                
@@ -79,7 +78,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)
@@ -105,4 +104,4 @@ else()
        endif()
 endif()
 
-MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARY)
+MARK_AS_ADVANCED(ASPELL_INCLUDE_DIR ASPELL_LIBRARY ASPELL_LIBRARY_RELEASE ASPELL_LIBRARY_DEBUG)