anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-26 06:15:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Cmake build: Remove cmake warnings about mismatched values of FindPackageHandleStandardArgs()

Browse Source 
(cherry picked from commit 9fdc00fe2a)
This commit is contained in:
Kornel Benko 2020-01-27 10:44:14 +01:00
parent 058283515a
commit a47dec6b4a
3 changed files with 44 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -771,7 +771,7 @@ if(NOT LYX_EXTERNAL_HUNSPELL)
message(STATUS " - library: ${HUNSPELL_LIBRARY}")
endif()
foreach(_spell "ASPELL" "Enchant" "Hunspell")
foreach(_spell "ASPELL" "ENCHANT" "HUNSPELL")
string(TOUPPER ${_spell} _upspell)
if (NOT ${_upspell}_FOUND)
find_package(${_spell})

22
development/cmake/modules/FindENCHANT.cmake Normal file
View File

@ -0,0 +1,22 @@
if(WIN32)
find_library(ENCHANT_LIBRARY "libenchant")
find_path(ENCHANT_INCLUDE_DIR "enchant++.h")
else()
find_library(ENCHANT_LIBRARY "enchant"
"/usr/local/lib"
${SYSTEM_LIB_DIRS}
"/opt/local/lib")
find_path(ENCHANT_INCLUDE_DIR "enchant++.h" PATHS
/usr/local/include
/usr/local/include/enchant
/usr/include
/usr/include/enchant
/opt/local/include/enchant)
endif()
# handle the QUIETLY and REQUIRED arguments and
# set ENCHANT_FOUND to TRUE if all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ENCHANT DEFAULT_MSG ENCHANT_LIBRARY ENCHANT_INCLUDE_DIR)
mark_as_advanced(ENCHANT_LIBRARY ENCHANT_INCLUDE_DIR)

21
development/cmake/modules/FindHUNSPELL.cmake Normal file
View File

@ -0,0 +1,21 @@
if(WIN32)
find_library(HUNSPELL_LIBRARY "libhunspell")
else()
find_library(HUNSPELL_LIBRARY NAMES "hunspell" "hunspell-1.2" PATHS "/usr/local/lib" ${SYSTEM_LIB_DIRS} "/usr/lib64")
endif()
FIND_PATH(HUNSPELL_INCLUDE_DIR "hunspell.hxx")
if (NOT HUNSPELL_INCLUDE_DIR)
FIND_PATH(HUNSPELL_INCLUDE_DIR "hunspell/hunspell.hxx")
if (HUNSPELL_INCLUDE_DIR)
set(HUNSPELL_INCLUDE_DIR "${HUNSPELL_INCLUDE_DIR}/hunspell")
endif()
endif()
# handle the QUIETLY and REQUIRED arguments and
# set HUNSPELL_FOUND to TRUE if all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(HUNSPELL DEFAULT_MSG HUNSPELL_LIBRARY HUNSPELL_INCLUDE_DIR)
mark_as_advanced(HUNSPELL_LIBRARY HUNSPELL_INCLUDE_DIR)