From 8ea2da4c3c52c16645a6f975784295d6b396278d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Sun, 18 Jul 2010 20:47:59 +0000 Subject: [PATCH] cmake: disbale CPACK by default, it triggers too much requirements git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34979 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 4 +--- development/cmake/modules/FindICONV.cmake | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index d19aa59bb3..a6827418ca 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -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) diff --git a/development/cmake/modules/FindICONV.cmake b/development/cmake/modules/FindICONV.cmake index b312a09235..3f2e7ce626 100644 --- a/development/cmake/modules/FindICONV.cmake +++ b/development/cmake/modules/FindICONV.cmake @@ -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) -- 2.39.2