Author: kornel
Date: Tue May 24 21:18:12 2011
New Revision: 38833
URL: http://www.lyx.org/trac/changeset/38833
Log:
Backport r38830, debian multiarch handling
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/CMakeLists.txt
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindASPELL.cmake
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindAiksaurusLIB.cmake
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindEnchant.cmake
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindHunspell.cmake
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindICONV.cmake
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindMyThesLIB.cmake
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindZLIB.cmake
Modified: lyx-devel/branches/BRANCH_2_0_X/development/cmake/CMakeLists.txt
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/cmake/CMakeLists.txt Tue May
24 20:36:27 2011 (r38832)
+++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/CMakeLists.txt Tue May
24 21:18:12 2011 (r38833)
@@ -25,6 +25,19 @@
# where to look first for cmake modules,
# before ${CMAKE_ROOT}/Modules is checked
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)
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindASPELL.cmake
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindASPELL.cmake
Tue May 24 20:36:27 2011 (r38832)
+++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindASPELL.cmake
Tue May 24 21:18:12 2011 (r38833)
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, Peter K�mmel, <[email protected]>
+# Copyright (c) 2006, Peter K�mmel, <[email protected]>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
@@ -54,8 +54,7 @@
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
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindAiksaurusLIB.cmake
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindAiksaurusLIB.cmake
Tue May 24 20:36:27 2011 (r38832)
+++
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindAiksaurusLIB.cmake
Tue May 24 21:18:12 2011 (r38833)
@@ -24,7 +24,7 @@
find_library(AIKSAURUSLIB_LIBRARY NAMES ${POTENTIAL_AIKSAURUS_LIBS}
PATHS
- /usr/lib /usr/local/lib)
+ ${SYSTEM_LIB_DIRS})
# handle the QUIETLY and REQUIRED arguments and set AIKSAURUSLIB_FOUND to TRUE
if
# all listed variables are TRUE
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindEnchant.cmake
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindEnchant.cmake
Tue May 24 20:36:27 2011 (r38832)
+++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindEnchant.cmake
Tue May 24 21:18:12 2011 (r38833)
@@ -4,8 +4,7 @@
else()
find_library(ENCHANT_LIBRARY "enchant"
"/usr/local/lib"
- "/usr/lib"
- "/usr/local/lib"
+ ${SYSTEM_LIB_DIRS}
"/opt/local/lib")
find_path(ENCHANT_INCLUDE_DIR "enchant++.h" PATHS
/usr/local/include
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindHunspell.cmake
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindHunspell.cmake
Tue May 24 20:36:27 2011 (r38832)
+++
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindHunspell.cmake
Tue May 24 21:18:12 2011 (r38833)
@@ -2,8 +2,7 @@
if(WIN32)
find_library(HUNSPELL_LIBRARY "libhunspell")
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" "/usr/lib" "/usr/lib64")
+ 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/hunspell.hxx")
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindICONV.cmake
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindICONV.cmake
Tue May 24 20:36:27 2011 (r38832)
+++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindICONV.cmake
Tue May 24 21:18:12 2011 (r38833)
@@ -39,7 +39,7 @@
set(POTENTIAL_ICONV_LIBS iconv libiconv libiconv2)
find_library(ICONV_LIBRARY NAMES ${POTENTIAL_ICONV_LIBS}
- PATHS /usr/lib /usr/local/lib)
+ PATHS ${SYSTEM_LIB_DIRS} )
if(WIN32)
set(ICONV_DLL_NAMES iconv.dll libiconv.dll libiconv2.dll)
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindMyThesLIB.cmake
==============================================================================
---
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindMyThesLIB.cmake
Tue May 24 20:36:27 2011 (r38832)
+++
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindMyThesLIB.cmake
Tue May 24 21:18:12 2011 (r38833)
@@ -18,8 +18,7 @@
set(POTENTIAL_MYTHES_LIBS mythes)
find_library(MYTHESLIB_LIBRARY NAMES ${POTENTIAL_MYTHES_LIBS}
- PATHS
- /usr/lib /usr/local/lib)
+ PATHS ${SYSTEM_LIB_DIRS} )
# handle the QUIETLY and REQUIRED arguments and set MYTHESLIB_FOUND to TRUE if
# all listed variables are TRUE
Modified:
lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindZLIB.cmake
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindZLIB.cmake
Tue May 24 20:36:27 2011 (r38832)
+++ lyx-devel/branches/BRANCH_2_0_X/development/cmake/modules/FindZLIB.cmake
Tue May 24 21:18:12 2011 (r38833)
@@ -17,9 +17,9 @@
set(POTENTIAL_Z_LIBS z zlib zdll)
find_library(ZLIB_LIBRARY NAMES ${POTENTIAL_Z_LIBS}
- PATHS
+ PATHS
"C:\\Programme\\Microsoft Visual Studio 8\\VC\\lib"
- /usr/lib /usr/local/lib
+ ${SYSTEM_LIB_DIRS}
"${GNUWIN32_DIR}"/lib)
if(ZLIB_INCLUDE_DIR AND ZLIB_LIBRARY)
