mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-20 06:49:56 +00:00
cmake: also build with win32libs
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24295 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
04a719f4a7
commit
f6de6828ef
@ -281,7 +281,7 @@ if(MSVC)
|
||||
endif()
|
||||
|
||||
# compiler tests, config.h generation
|
||||
if(UNIX)
|
||||
if(UNIX OR CONFIGURECHECKS)
|
||||
include(ConfigureChecks.cmake)
|
||||
configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h)
|
||||
else()
|
||||
|
@ -62,6 +62,7 @@ set(intl_sources
|
||||
printf.c
|
||||
osdep.c
|
||||
intl-compat.c
|
||||
langprefs.c
|
||||
)
|
||||
|
||||
lyx_add_path(intl_sources ${TOP_SRC_DIR}/intl)
|
||||
|
@ -52,7 +52,7 @@ 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
|
||||
@ -60,7 +60,7 @@ FIND_LIBRARY(ASPELL_LIBRARY_RELEASE NAMES aspell aspell-15 libaspell
|
||||
|
||||
# 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)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user