anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

cmake: disbale CPACK by default, it triggers too much requirements

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34979 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-07-18 20:47:59 +00:00
parent d45859d337
commit 8ea2da4c3c
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
development/cmake/CMakeLists.txt
View File

@ -34,7 +34,7 @@ message(STATUS "Switch LYX_* variables by -DLYX_*=1 or 0:")
message(STATUS)
message(STATUS "Switch LYX_* variables by -DLYX_*=1 or 0:")
message(STATUS)
LYX_OPTION(CPACK "Use the CPack management (Implies LYX_INSTALL option)" ON ALL)
LYX_OPTION(CPACK "Use the CPack management (Implies LYX_INSTALL option)" OFF ALL)
LYX_OPTION(NLS "Use nls" OFF ALL)
LYX_OPTION(ASPELL "Require aspell" OFF ALL)
LYX_OPTION(AIKSAURUS "Require Aiksaurus" OFF ALL)
@ -248,8 +248,6 @@ if(NOT MSVC)
endif()
# We need in FindICONV.cmake this one
include(CheckFunctionExists)
find_package(Qt4 REQUIRED)
find_package(ICONV REQUIRED)
find_package(ZLIB REQUIRED)

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

@ -69,6 +69,7 @@ if(WIN32)
set(ICONV_FOUND TRUE)
endif()
else()
include(CheckFunctionExists)
check_function_exists(iconv HAVE_ICONV_IN_LIBC)
if(ICONV_INCLUDE_DIR AND HAVE_ICONV_IN_LIBC)
set(ICONV_FOUND TRUE)