Backport r38830, debian multiarch handling

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@38833 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2011-05-24 19:18:12 +00:00
parent 902c932674
commit cf45962d76
8 changed files with 22 additions and 13 deletions

View File

@ -25,6 +25,19 @@ set(CMAKE_SUPPRESS_REGENERATION FALSE)
# where to look first for cmake modules, # where to look first for cmake modules,
# before ${CMAKE_ROOT}/Modules is checked # before ${CMAKE_ROOT}/Modules is checked
set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules") set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/modules")
if(UNIX)
FIND_PROGRAM(DPKG_ARCHITECTURE_EXECUTABLE dpkg-architecture)
if(DPKG_ARCHITECTURE_EXECUTABLE)
EXECUTE_PROCESS(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH OUTPUT_VARIABLE ARCH_TRIPLET OUTPUT_STRIP_TRAILING_WHITESPACE)
endif()
endif()
if(ARCH_TRIPLET)
set(SYSTEM_LIB_DIRS /usr/lib /usr/lib/${ARCH_TRIPLET} /usr/local/lib)
else()
set(SYSTEM_LIB_DIRS /usr/lib /usr/local/lib)
endif()
include(LyXMacros) include(LyXMacros)

View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2006, Peter Kümmel, <syntheticpp@gmx.net> # Copyright (c) 2006, Peter K<EFBFBD>mmel, <syntheticpp@gmx.net>
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions # modification, are permitted provided that the following conditions
@ -54,8 +54,7 @@ FIND_PATH(ASPELL_INCLUDE_DIR aspell.h
FIND_LIBRARY(ASPELL_LIBRARY_RELEASE NAMES aspell aspell-15 libaspell libaspell-15 FIND_LIBRARY(ASPELL_LIBRARY_RELEASE NAMES aspell aspell-15 libaspell libaspell-15
PATHS PATHS
/usr/lib ${SYSTEM_LIB_DIRS}
/usr/local/lib
) )
# msvc makes a difference between debug and release # msvc makes a difference between debug and release

View File

@ -24,7 +24,7 @@ set(POTENTIAL_AIKSAURUS_LIBS Aiksaurus)
find_library(AIKSAURUSLIB_LIBRARY NAMES ${POTENTIAL_AIKSAURUS_LIBS} find_library(AIKSAURUSLIB_LIBRARY NAMES ${POTENTIAL_AIKSAURUS_LIBS}
PATHS PATHS
/usr/lib /usr/local/lib) ${SYSTEM_LIB_DIRS})
# handle the QUIETLY and REQUIRED arguments and set AIKSAURUSLIB_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set AIKSAURUSLIB_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE

View File

@ -4,8 +4,7 @@ if(WIN32)
else() else()
find_library(ENCHANT_LIBRARY "enchant" find_library(ENCHANT_LIBRARY "enchant"
"/usr/local/lib" "/usr/local/lib"
"/usr/lib" ${SYSTEM_LIB_DIRS}
"/usr/local/lib"
"/opt/local/lib") "/opt/local/lib")
find_path(ENCHANT_INCLUDE_DIR "enchant++.h" PATHS find_path(ENCHANT_INCLUDE_DIR "enchant++.h" PATHS
/usr/local/include /usr/local/include

View File

@ -2,8 +2,7 @@
if(WIN32) if(WIN32)
find_library(HUNSPELL_LIBRARY "libhunspell") find_library(HUNSPELL_LIBRARY "libhunspell")
else() else()
#find_library(HUNSPELL_LIBRARY NAME "hunspell" PATH "/usr/local/lib" "/usr/lib" NO_DEFAULT_PATH) find_library(HUNSPELL_LIBRARY NAMES "hunspell" "hunspell-1.2" PATHS "/usr/local/lib" ${SYSTEM_LIB_DIRS} "/usr/lib64")
find_library(HUNSPELL_LIBRARY NAMES "hunspell" "hunspell-1.2" PATHS "/usr/local/lib" "/usr/lib" "/usr/lib64")
endif() endif()
FIND_PATH(HUNSPELL_INCLUDE_DIR "hunspell/hunspell.hxx") FIND_PATH(HUNSPELL_INCLUDE_DIR "hunspell/hunspell.hxx")

View File

@ -39,7 +39,7 @@ find_path(ICONV_INCLUDE_DIR iconv.h
set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2) set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS} find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
PATHS /usr/lib /usr/local/lib) PATHS ${SYSTEM_LIB_DIRS} )
if(WIN32) if(WIN32)
set(ICONV_DLL_NAMES iconv.dll libiconv.dll libiconv2.dll) set(ICONV_DLL_NAMES iconv.dll libiconv.dll libiconv2.dll)

View File

@ -18,8 +18,7 @@ find_path(MYTHESLIB_INCLUDE_DIR ${MYTHES_H}
set(POTENTIAL_MYTHES_LIBS mythes) set(POTENTIAL_MYTHES_LIBS mythes)
find_library(MYTHESLIB_LIBRARY NAMES ${POTENTIAL_MYTHES_LIBS} find_library(MYTHESLIB_LIBRARY NAMES ${POTENTIAL_MYTHES_LIBS}
PATHS PATHS ${SYSTEM_LIB_DIRS} )
/usr/lib /usr/local/lib)
# handle the QUIETLY and REQUIRED arguments and set MYTHESLIB_FOUND to TRUE if # handle the QUIETLY and REQUIRED arguments and set MYTHESLIB_FOUND to TRUE if
# all listed variables are TRUE # all listed variables are TRUE

View File

@ -17,9 +17,9 @@ find_path(ZLIB_INCLUDE_DIR zlib.h
set(POTENTIAL_Z_LIBS z zlib zdll) set(POTENTIAL_Z_LIBS z zlib zdll)
find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS} find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
PATHS PATHS
"C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib" "C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
/usr/lib /usr/local/lib ${SYSTEM_LIB_DIRS}
"${GNUWIN32_DIR}"/lib) "${GNUWIN32_DIR}"/lib)
if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY) if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)