Author: kuemmel
Date: Sun Jul 18 22:47:59 2010
New Revision: 34979
URL: http://www.lyx.org/trac/changeset/34979
Log:
cmake: disbale CPACK by default, it triggers too much requirements
Modified:
lyx-devel/trunk/development/cmake/CMakeLists.txt
lyx-devel/trunk/development/cmake/modules/FindICONV.cmake
Modified: lyx-devel/trunk/development/cmake/CMakeLists.txt
==============================================================================
--- lyx-devel/trunk/development/cmake/CMakeLists.txt Sun Jul 18 17:47:28
2010 (r34978)
+++ lyx-devel/trunk/development/cmake/CMakeLists.txt Sun Jul 18 22:47:59
2010 (r34979)
@@ -34,7 +34,7 @@
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 @@
endif()
-# We need in FindICONV.cmake this one
-include(CheckFunctionExists)
find_package(Qt4 REQUIRED)
find_package(ICONV REQUIRED)
find_package(ZLIB REQUIRED)
Modified: lyx-devel/trunk/development/cmake/modules/FindICONV.cmake
==============================================================================
--- lyx-devel/trunk/development/cmake/modules/FindICONV.cmake Sun Jul 18
17:47:28 2010 (r34978)
+++ lyx-devel/trunk/development/cmake/modules/FindICONV.cmake Sun Jul 18
22:47:59 2010 (r34979)
@@ -69,6 +69,7 @@
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)
