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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index d19aa59bb3f18634ad0e84f8373d4c2b56257b14..a6827418ca44565f37335bfc867f6d9a09fc5734 100644 (file)
--- 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 b312a09235cd006ff7731b1b860545df8ba292ab..3f2e7ce626d3a1b8c2ac508b463a69c9fda4ba4c 100644 (file)
--- 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)