anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Prepare cmake-build for debian multiarch implementation

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38830 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Kornel Benko 2011-05-24 06:58:40 +00:00
parent b18e8e7a02
commit f2e437f6b8
8 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
CMakeLists.txt
View File

@ -42,6 +42,18 @@ if(NOT help AND NOT HELP)
project(${LYX_PROJECT}) project(${LYX_PROJECT})
endif() endif()
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)
# Usage LYX_OPTION # Usage LYX_OPTION
@ -102,7 +114,6 @@ if(help OR HELP)
message(STATUS) message(STATUS)
else() else()
# Check option dependencies # Check option dependencies
if(LYX_CPACK) if(LYX_CPACK)

3
development/cmake/modules/FindASPELL.cmake
View File

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

2
development/cmake/modules/FindAiksaurusLIB.cmake
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

3
development/cmake/modules/FindEnchant.cmake
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

3
development/cmake/modules/FindHunspell.cmake
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")

4
development/cmake/modules/FindICONV.cmake
View File

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

3
development/cmake/modules/FindMyThesLIB.cmake
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

2
development/cmake/modules/FindZLIB.cmake
View File

@ -28,7 +28,7 @@ find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
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/lib/x86_64-linux-gnu /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)