endforeach(_c_l)
if(UseVersionSuffix)
- message("-- Using versioned PACKAGE. Disable with -DUseVersionSuffix=0")
+ message(STATUS "-- Using versioned PACKAGE. Disable with -DUseVersionSuffix=0")
set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
else()
- message("-- PACKAGE not versioned, to enable use -DUseVersionSuffix=1")
+ message(STATUS "-- PACKAGE not versioned, to enable use -DUseVersionSuffix=1")
set(PACKAGE ${PACKAGE_BASE})
set(PROGRAM_SUFFIX "")
endif()
# don't use the default "/usr/local"
# but respect the user-choice on the command-line
SET(CMAKE_INSTALL_PREFIX
- "/usr/local/share/lyx${LYX_INSTALL_SUFFIX}" CACHE PATH "LyX install prefix" FORCE)
+ "/usr/local/${project}${LYX_INSTALL_SUFFIX}" CACHE PATH "LyX install prefix" FORCE)
endif()
if(WIN32)
SET(CMAKE_INSTALL_PREFIX
add_definitions(-DHAVE_GETTEXT)
endif()
-message("")
+if(WIN32)
+ find_library(HUNSPELL_LIBRARY "libhunspell")
+else()
+ find_library(HUNSPELL_LIBRARY "hunspell")
+endif()
+if (HUNSPELL_LIBRARY)
+ find_file(HUNSPELL_FOUND "hunspell/hunspell.hxx")
+endif()
+
+if (HUNSPELL_FOUND)
+ add_definitions(-DUSE_HUNSPELL=1)
+ message(STATUS "----- Building with USE_HUNSPELL")
+else()
+ message(STATUS "----- Hunspell not found, building without hunspell support")
+endif()
+
+message(STATUS "")
if(nls OR all)
set(nls TRUE CACHE TYPE STRING)
add_definitions(-DENABLE_NLS=1)
- message("----- Building with ENABLE_NLS")
-else()
- message("----- No nls, to enable use -Dnls=1")
+ message(STATUS "----- Building with ENABLE_NLS")
+else()
+ message(STATUS "----- No nls, to enable use -Dnls=1")
endif()
set(nls)
if(ASPELL_FOUND)
add_definitions(-DUSE_ASPELL=1)
- message("----- Building with USE_ASPELL")
-else()
- message("----- No aspell, to get more information use -Daspell=1")
+ message(STATUS "----- Building with USE_ASPELL")
+else()
+ message(STATUS "----- No aspell, to get more information use -Daspell=1")
endif()
set(all)
set(noconsole TRUE CACHE TYPE STRING)
set(WIN32_CONSOLE WIN32)
set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY})
- message("----- Console disabled")
+ message(STATUS "----- Console disabled")
else()
- message("----- Console enabled, disable it with -Dnoconsole=1")
+ message(STATUS "----- Console enabled, disable it with -Dnoconsole=1")
endif()
if(MSVC)
- add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
+ add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
# disable checked iterators for msvc release builds to get maximum speed
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
else()
endif()
endif()
-message("")
+message(STATUS "")
foreach(_v PACKAGE PACKAGE_VERSION
PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER
LYX_ABS_TOP_SRCDIR
message(FATAL_ERROR "${_v} not defined")
endif()
string(SUBSTRING "${_v} " 0 28 _v1)
- message("----- ${_v1}: ${${_v}}")
+ message(STATUS "----- ${_v1}: ${${_v}}")
endforeach(_v)
-message("")
+message(STATUS "")
-add_definitions(-DBOOST_USER_CONFIG="<config.h>")
-
if(MSVC AND NOT disable-pch AND NOT MERGE_FILES)
- message("-----")
- message("----- using precompiled headers, disable with -Ddisable-pch=1")
- message("-----")
+ message(STATUS "-----")
+ message(STATUS "----- using precompiled headers, disable with -Ddisable-pch=1")
+ message(STATUS "-----")
configure_file(${CMAKE_SOURCE_DIR}/pcheaders.h
${CMAKE_BINARY_DIR}/pcheaders.h)
configure_file(${CMAKE_SOURCE_DIR}/config.cpp.cmake
"${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST")
else()
if(MSVC)
- message("-----")
- message("----- precompiled headers disabled, enable with -Ddisable-pch=0")
- message("-----")
+ message(STATUS "-----")
+ message(STATUS "----- precompiled headers disabled, enable with -Ddisable-pch=0")
+ message(STATUS "-----")
endif()
set(disable-pch TRUE CACHE TYPE STRING)
macro(lyx_add_msvc_pch)
endmacro(lyx_add_msvc_pch)
endif()
-if(MSVC)
+if(MSVC)
if(vld)
set(vld 1 CACHE TYPE STRING FORCE)
set(LYX_LEAK_DETECTION 1 CACHE TYPE STRING FORCE)
if(WALL)
set(WALL 1 CACHE TYPE STRING FORCE)
-
+
# Use the highest warning level
set(CMAKE_CXX_WARNING_LEVEL 4 CACHE TYPE STRING FORCE)
set(WARNING_LEVEL_MESSAGE "(switch to warning level 3 with -DWALL=0)")
-
+
if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
endif()
-
+
if(CMAKE_C_FLAGS MATCHES "/W[0-4]")
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
endif()
-
+
# add here warnings which should produce an error /weXXXX
set(MSVC_W_ERROR "/we4101 /we4189")
# add here warnings which should be disabled /wdXXXX
set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4311 /wd4312 /wd4505 /wd4267 /wd4512 /wd4245 /wd4127 /wd4180")
-
+
set(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
- set(CMAKE_CXX_FLAGS_RELEASEs
+ set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
set(CMAKE_CXX_FLAGS_MINSIZEREL
"${CMAKE_CXX_FLAGS_MINSIZEREL} /Wp64 ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-
- else()
+
+ else()
set(WALL 0 CACHE TYPE STRING FORCE)
-
+
set(CMAKE_CXX_WARNING_LEVEL 3 CACHE TYPE STRING FORCE)
set(WARNING_LEVEL_MESSAGE "(switch to warning level 4 with -DWALL=1)")
-
+
# add here warnings which should produce an error /weXXXX
set(MSVC_W_ERROR "/we4101 /we4189")
# add here warnings which should be disabled /wdXXXX
set(MSVC_W_DISABLE "/wd4288 /wd4355 /wd4800 /wd4996 /wd4267 /wd4180")
-
+
set(CMAKE_CXX_FLAGS_DEBUG
"${CMAKE_CXX_FLAGS_DEBUG} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
set(CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
set(CMAKE_CXX_FLAGS_MINSIZEREL
"${CMAKE_CXX_FLAGS_MINSIZEREL} ${MSVC_W_ERROR} ${MSVC_W_DISABLE}")
-
+
endif()
-
- message("----- Warning level : ${CMAKE_CXX_WARNING_LEVEL} ${WARNING_LEVEL_MESSAGE}")
- message("----- Warnings as errors : ${MSVC_W_ERROR}")
- message("----- Warnings disabled : ${MSVC_W_DISABLE}")
- message("")
-
+
+ message(STATUS "----- Warning level : ${CMAKE_CXX_WARNING_LEVEL} ${WARNING_LEVEL_MESSAGE}")
+ message(STATUS "----- Warnings as errors : ${MSVC_W_ERROR}")
+ message(STATUS "----- Warnings disabled : ${MSVC_W_DISABLE}")
+ message(STATUS "")
+
endif()
-if(nls OR all)
- find_package(LyXGettext REQUIRED)
- include_directories(${TOP_SRC_DIR}/po)
- add_subdirectory(po)
+FIND_PROGRAM(_PERL_EXECUTABLE perl)
+if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
+ if(nls OR all)
+ find_package(LyXGettext REQUIRED)
+ include_directories(${TOP_SRC_DIR}/po)
+ add_subdirectory(po)
+ endif()
endif()
# compiler tests, config.h generation
include(ConfigureChecks.cmake)
configure_file(configCompiler.h.cmake ${CMAKE_BINARY_DIR}/configCompiler.h)
endif()
-configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
+configure_file(config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
find_package(ICONV REQUIRED)
add_definitions(-DHAVE_ICONV=1)
+
include_directories(
- ${CMAKE_BINARY_DIR}
- ${TOP_SRC_DIR}/src
- ${TOP_SRC_DIR}/boost)
+ ${CMAKE_BINARY_DIR}
+ ${TOP_SRC_DIR}/src)
+
+option(UseExternalBoost "Use external boost" OFF)
+if(UseExternalBoost)
+ message(STATUS "Searching for boost")
+ find_package(Boost COMPONENTS signals regex)
+ if(Boost_FOUND)
+ message(STATUS "Boost found")
+ message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
+ set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
+ else()
+ message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
+ endif()
+else()
+ message(STATUS "----- Using internal boost. To build with installed version use -DUseExternalBoost:BOOL=ON")
+ set(Lyx_Boost_Libraries boost_signals boost_regex)
+ add_definitions(-DBOOST_USER_CONFIG="<config.h>")
+ include_directories(${TOP_SRC_DIR}/boost)
+ add_subdirectory(boost)
+endif()
+
-add_subdirectory(boost)
if(NOT use_external_libintl)
- add_subdirectory(intl)
+ add_subdirectory(intl)
endif()
add_subdirectory(src)
add_subdirectory(man)
-add_subdirectory(doc)
+if(NOT ${_PERL_EXECUTABLE} MATCHES "-NOTFOUND")
+ add_subdirectory(doc)
+endif()
add_subdirectory(lyx2lyx)
add_subdirectory(scripts)
SET(CPACK_PACKAGE_VERSION_MAJOR "${LYX_MAJOR_VERSION}")
SET(CPACK_PACKAGE_VERSION_MINOR "${LYX_MINOR_VERSION}")
FILE(STRINGS "${TOP_SRC_DIR}/development/cmake/LyX_summary.txt" CPACK_PACKAGE_DESCRIPTION_SUMMARY)
-#SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "A WYSIWYM (What You See Is What You Mean) document processor")
SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CMake ${LYX_INSTALL_SUFFIX}")
#
# needed by rpm
SET(CPACK_SET_DESTDIR "ON")
-SET(CPACK_RPM_PACKAGE_LICENSE "GPL")
+FILE(READ "${TOP_SRC_DIR}/development/cmake/LyX_license.txt" CPACK_RPM_PACKAGE_LICENSE)
SET(CPACK_RPM_PACKAGE_GROUP "Applications/Publishing")
SET(CPACK_RPM_PACKAGE_VENDOR "The LyX team")
#
# the next ones are needed by deb
SET(CPACK_PACKAGE_CONTACT "${PACKAGE_BUGREPORT}")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "lyx-${LYX_INSTALL_SUFFIX}")
+SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${project}-${LYX_INSTALL_SUFFIX}")
+
+# This is experimental, valid on _my_ system (Kornel)
+SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libqtgui4 (>= 4.4.3-0)")
+IF(ASPELL_FOUND)
+ SET(CPACK_DEBIAN_PACKAGE_DEPENDS "libaspell15 (>= 0.60.6-1),${CPACK_DEBIAN_PACKAGE_DEPENDS}")
+ENDIF()
#
-# for the next ones, cmake insists on data with values in some file
+# for the next ones, cpack insists on data with values in some file
SET(CPACK_PACKAGE_DESCRIPTION_FILE "${TOP_SRC_DIR}/development/cmake/LyX_description.txt")
SET(CPACK_RESOURCE_FILE_LICENSE "${TOP_SRC_DIR}/development/cmake/LyX_license.txt")
+
+# Find the revision number and use it as the release in rpm-package-build.
+# This way we may omit the otherwise needed "--force" parameter when
+# installing from that rpm package.
+FIND_PROGRAM(_svnversion svnversion)
+message(STATUS "svnversion = ${_svnversion}")
+if(NOT ${_svnversion} MATCHES "-NOTFOUND")
+ EXECUTE_PROCESS(COMMAND ${_svnversion} WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE CPACK_RPM_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+ # We use this value also to set the package-patch-value
+ if(CPACK_RPM_PACKAGE_RELEASE MATCHES "^\([0-9]+\)")
+ set(CPACK_PACKAGE_VERSION_PATCH ${CMAKE_MATCH_1})
+ endif()
+endif()
+
# we do not have a readme or welcome data,
# so we do not provide infofiles for
# CPACK_RESOURCE_FILE_README and CPACK_RESOURCE_FILE_WELCOME
#Now it is possible to create some packages
# cd <BuildDir>
# make package
+#############################################################################################
+# So, e.g. for variables
+# CMAKE_PROJECT_NAME : lyx
+# CPACK_PACKAGE_VERSION_MAJOR : 2
+# CPACK_PACKAGE_VERSION_MINOR : 0
+# CPACK_PACKAGE_VERSION_PATCH : 1
+# CMAKE_SYSTEM_NAME : Linux
+# CPACK_BINARY_DEB:BOOL : ON
+#
+# the package name builds as "lyx-2.0.1-Linux.deb"
+#
############################## rpm ################################### deb ##################
# create # cpack -G RPM --config CPackConfig.cmake # cpack -G DEB --config CPackConfig.cmake
-# creates =># lyx-2.0.1-Linux.rpm # ==> lyx-2.0.1-Linux.deb
+# creates =># lyx-2.0.1-Linux.rpm # lyx-2.0.1-Linux.deb
# list # rpm -qlp lyx-2.0.1-Linux.rpm # dpkg-deb -c lyx-2.0.1-Linux.deb
# install # rpm -U lyx-2.0.1-Linux.rpm # dpkg -i lyx-2.0.1-Linux.deb
#
-
projects / lyx.git / blobdiff