X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=7fd8b26f764b94a56aa9b8e7a1966548be3137a2;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=023c3e14b71e9d51a766724c9f924e6fffc395b7;hpb=b73c6462d67b0fe26d28ef0549ab76b709879b18;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 023c3e14b7..7fd8b26f76 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,8 +10,9 @@ set(LYX_PROJECT LyX)
 
 enable_testing()
 
-get_filename_component(lyx_dir_readme ${CMAKE_SOURCE_DIR}/README ABSOLUTE)
+get_filename_component(lyx_dir_readme ${CMAKE_SOURCE_DIR}/README REALPATH) # Resolve symlinks
 get_filename_component(TOP_SRC_DIR ${lyx_dir_readme} PATH)
+message(STATUS "TOP_SRC_DIR = ${TOP_SRC_DIR}")
 
 set(LYX_CMAKE_DIR "development/cmake")
 set(TOP_CMAKE_PATH "${TOP_SRC_DIR}/${LYX_CMAKE_DIR}")
@@ -38,6 +39,18 @@ file(MAKE_DIRECTORY "${LYX_TESTS_USERDIR}")
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 OLD)
 	cmake_policy(SET CMP0005 OLD)
+	# Installing MACOSX_BUNDLE targets requires a BUNDLE DESTINATION
+	cmake_policy(SET CMP0006 NEW)
+	if(POLICY CMP0020)
+		cmake_policy(SET CMP0020 OLD)
+	endif()
+	if(POLICY CMP0028)
+		cmake_policy(SET CMP0028 OLD)
+	endif()
+	if(POLICY CMP0043)
+		# COMPILE_DEFINITIONS are not used yet. Enable new behavior.
+		cmake_policy(SET CMP0043 NEW)
+	endif()
 endif()
 
 set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
@@ -45,9 +58,29 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
 # Supress regeneration
 set(CMAKE_SUPPRESS_REGENERATION FALSE)
 
+if(LYX_XMINGW)
+    set(CMAKE_SYSTEM_NAME Windows)
+    set(TOOLNAME ${LYX_XMINGW})
+    set(TOOLCHAIN "${TOOLNAME}-")
+    set(CMAKE_C_COMPILER   "${TOOLCHAIN}gcc"     CACHE PATH "Mingw C compiler" FORCE)
+    set(CMAKE_CXX_COMPILER "${TOOLCHAIN}g++"     CACHE PATH "Mingw C++ compiler" FORCE)
+    set(CMAKE_RC_COMPILER  "${TOOLCHAIN}windres" CACHE PATH "Mingw rc compiler" FORCE)
+
+    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM BOTH)
+    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
+    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+endif()
+
 if(NOT help AND NOT HELP)
-	# 'project' triggers the searching for a compiler
-	project(${LYX_PROJECT})
+  # 'project' triggers the searching for a compiler
+  project(${LYX_PROJECT})
+  if (CMAKE_COMPILER_IS_GNUCXX)
+    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.0")
+      message(STATUS "Gnu CXX compiler version = ${CMAKE_CXX_COMPILER_VERSION}")
+      message(STATUS "is too old, should be >= 4.0")
+      message(FATAL_ERROR "Exiting")
+    endif()
+  endif()
 endif()
 
 if(UNIX)
@@ -67,6 +100,7 @@ else()
 endif()
 
 include(LyXMacros)
+include(LyXDestinations)
 
 # Usage LYX_OPTION
 # 1. parameter: option name without prefix 'LYX_'
@@ -74,6 +108,11 @@ include(LyXMacros)
 # 3. parameter: default value, ON or OFF
 # 4. parameter: system on which option is used: ALL, GCC, MSVC, ...
 
+# Usage LYX_COMBO
+# 1. parameter: name without prefix 'LYX_'
+# 2. parameter: description
+# 3. parameter: default value
+# 4-n parameter: possible other string values
 
 LYX_OPTION_INIT()
 
@@ -82,6 +121,7 @@ LYX_OPTION(CPACK            "Use the CPack management (Implies LYX_INSTALL optio
 LYX_OPTION(LOCALVERSIONING  "Add version info to created package name (only used if LYX_CPACK option set)" OFF ALL)
 LYX_OPTION(INSTALL          "Build install projects/rules (implies a bunch of other options)" OFF ALL)
 LYX_OPTION(NLS              "Enable Native Language Support (NLS)" ON ALL)
+LYX_OPTION(REQUIRE_SPELLCHECK "Abort if no spellchecker available" OFF ALL)
 LYX_OPTION(ASPELL           "Require aspell" OFF ALL)
 LYX_OPTION(ENCHANT          "Require Enchant" OFF ALL)
 LYX_OPTION(HUNSPELL         "Require Hunspell" OFF ALL)
@@ -90,6 +130,7 @@ LYX_OPTION(RELEASE          "Build release version, build debug when disabled" O
 LYX_OPTION(DEBUG            "Enforce debug build"  OFF ALL)
 LYX_OPTION(NO_OPTIMIZE      "Don't use any optimization/debug flags"  OFF ALL)
 LYX_OPTION(PACKAGE_SUFFIX   "Use version suffix for packaging" ON ALL)
+LYX_STRING(SUFFIX_VALUE     "Use this string as suffix" "")
 LYX_OPTION(PCH              "Use precompiled headers" OFF ALL)
 LYX_OPTION(MERGE_FILES      "Merge source files into one compilation unit" OFF ALL)
 LYX_OPTION(MERGE_REBUILD    "Rebuild generated files from merged files build" OFF ALL)
@@ -97,6 +138,14 @@ LYX_OPTION(QUIET            "Don't generate verbose makefiles" OFF ALL)
 LYX_OPTION(INSTALL_PREFIX   "Install path for LyX" OFF ALL)
 LYX_OPTION(BUNDLE           "Build bundle  (experimental) " OFF ALL)
 LYX_OPTION(ENABLE_URLTESTS  "Enable for URL tests" OFF ALL)
+LYX_OPTION(ENABLE_EXPORT_TESTS "Enable for export tests" OFF ALL)
+LYX_OPTION(ENABLE_KEYTESTS  "Enable for keytests" OFF ALL)
+LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
+LYX_COMBO(USE_QT            "Use Qt version as frontend" QT4 QT5)
+#LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
+LYX_OPTION(EXTERNAL_Z       "Build 3rdparty lib zlib" ON ALL)
+LYX_OPTION(EXTERNAL_ICONV   "Build 3rdparty lib iconvlib" ON ALL)
+LYX_OPTION(EXTERNAL_HUNSPELL "Build 3rdparty lib hunspelllib" ON ALL)
 
 # GCC specific
 LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
@@ -105,15 +154,12 @@ LYX_OPTION(PROGRAM_SUFFIX       "Append version suffix to binaries" ON GCC)
 LYX_OPTION(DEBUG_GLIBC          "Enable libstdc++ debug mode" OFF GCC)
 LYX_OPTION(DEBUG_GLIBC_PEDANTIC "Enable libstdc++ pedantic debug mode" OFF GCC)
 LYX_OPTION(STDLIB_DEBUG         "Use debug stdlib" OFF GCC)
-LYX_OPTION(CONCEPT_CHECKS       "Enable concept-checks" OFF GCC)
 LYX_OPTION(PROFILE              "Build with options for gprof" OFF GCC)
-LYX_OPTION(ENABLE_CXX11         "Build with options for c++11-mode" OFF GCC)
 
 # MSVC specific
 LYX_OPTION(CONSOLE               "Show console on Windows, enforce with =FORCE" ON MSVC)
 LYX_OPTION(VLD                   "Use VLD with MSVC" OFF MSVC)
 LYX_OPTION(WALL                  "Enable all warnings" OFF MSVC)
-LYX_OPTION(CONFIGURE_CHECKS      "Also run configure checks for MSVC" OFF MSVC)
 LYX_OPTION(DEPENDENCIES_DOWNLOAD "Download dependencies for MSVC 10" OFF MSVC)
 
 # APPLE specific
@@ -143,7 +189,7 @@ endif()
 
 if(LYX_INSTALL)
 	set(LYX_NLS ON)
-	if (WIN32)
+        if(WIN32 AND NOT MINGW)
 		set(LYX_HUNSPELL ON)
 	endif()
 	if(LYX_CONSOLE MATCHES "FORCE")
@@ -167,10 +213,20 @@ endif()
 
 if(LYX_DEPENDENCIES_DOWNLOAD)
 	message(STATUS)
-	set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps)
-	message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}")
-	set(deps_files lyx20-deps-msvc2010-x86.zip)
-	set(deps_server http://downloads.sourceforge.net/project/lyx/Win_installers/Dependencies)
+	if(MSVC14)
+		set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2015-deps)
+		set(deps_files lyx-windows-deps-msvc2015.zip)
+		set(deps_server http://ftp.lyx.de/LyX-Windows-Deps)
+		set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2015)
+	elseif(MSVC10)
+		set(LYX_DEPENDENCIES_DIR ${TOP_BINARY_DIR}/msvc2010-deps)
+		set(deps_files lyx-windows-deps-msvc2010.zip)
+		set(deps_server http://ftp.lyx.de/LyX-Windows-Deps)
+		set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/lyx-windows-deps-msvc2010)
+	else()
+		message(FATAL_ERROR "error: no dependency package known for the selected MSVC version.")
+	endif()
+    message(STATUS "Using downloaded dependencies in ${LYX_DEPENDENCIES_DIR}")
 	foreach(it ${deps_files})
 		set(already_downloaded already_downloaded-NOTFOUND CACHE PATH "downloaded" FORCE)
 		find_file(already_downloaded ${it} "${LYX_DEPENDENCIES_DIR}/download")
@@ -187,7 +243,6 @@ if(LYX_DEPENDENCIES_DOWNLOAD)
 		                      WORKING_DIRECTORY ${LYX_DEPENDENCIES_DIR})
 		endif()
 	endforeach()
-	set(GNUWIN32_DIR ${LYX_DEPENDENCIES_DIR}/deps20)
 endif()
 
 
@@ -202,28 +257,42 @@ else()
 endif()
 
 
+# Set to some meaningful default
+find_package(CXX11Compiler)
+if(NOT CXX11COMPILER_FOUND)
+	message(FATAL_ERROR "A C++11 compatible compiler is required.")
+endif()
 set(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
-	execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-	message(STATUS "Using GCC version ${GCC_VERSION}")
-	if(NOT GCC_VERSION VERSION_LESS 4.4)
-		set(LYX_USE_TR1 1)
-		# GCC <= 4.5 does not support regex: there are linker errors
-		# http://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#status.iso.tr1
-		set(LYX_USE_TR1_REGEX 0)
-	endif()
-	if (LYX_ENABLE_CXX11)
-		find_package(CXX11Compiler)
-		if(NOT CXX11COMPILER_FOUND)
-			message(FATAL_ERROR "A C++11 compatible compiler is required.")
-		endif()
-		set(LYX_GCC11_MODE "${CXX11_FLAG}")
+	if (CMAKE_CXX_COMPILER_ID MATCHES "^[cC]lang$")
+	  # ignore the GCC_VERSION for clang
+	  # and use the resulting CXX11_STD_REGEX found in FindCXX11Compiler.cmake
+	  message(STATUS "Using clang")
+	  if(CXX11_STD_REGEX)
+	    set(LYX_USE_STD_REGEX 1)
+	  else()
+	    set(LYX_USE_STD_REGEX 0)
+	  endif()
+	else()
+	  execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
+	  message(STATUS "Using GCC version ${GCC_VERSION}")
+	  if(GCC_VERSION VERSION_LESS 4.9)
+		  if(GCC_VERSION VERSION_LESS 4.6)
+			  message(FATAL_ERROR "gcc >= 4.6 is required.")
+		  endif()
+		  # <regex> in gcc is unusable in versions less than 4.9.0
+		  # see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=53631
+		  set(LYX_USE_STD_REGEX 0)
+	  else()
+		  set(LYX_USE_STD_REGEX 1)
+	  endif()
 	endif()
+	set(LYX_GCC11_MODE "${CXX11_FLAG}")
 else()
-	if(MSVC10)
-		set(LYX_USE_TR1 1)
-		#set(LYX_USE_TR1_REGEX 1) #TODO should we use it in ECMAScript mode?
-	endif()
+	set(LYX_USE_STD_REGEX 0)
+#	if(MSVC10)
+#		set(LYX_USE_STD_REGEX 1) #TODO should we use it in ECMAScript mode?
+#	endif()
 endif()
 
 
@@ -235,6 +304,10 @@ include(LyXPaths)
 file(STRINGS "${TOP_SRC_DIR}/configure.ac" _config_lines)
 
 if(WIN32)
+	set(CMAKE_PREFIX_PATH Specify-path-to-Qt CACHE PATH "Used Qt version")
+	if(MSVC)
+		set(LYX_3RDPARTY_BUILD ON CACHE BOOL "Build 3rdparty libraries" FORCE)
+	endif()
 	set(USE_WINDOWS_PACKAGING ON)
 elseif(APPLE)
 	set(USE_MACOSX_PACKAGING ON)
@@ -242,6 +315,14 @@ else()
 	set(USE_POSIX_PACKAGING ON)
 endif()
 
+if(LYX_3RDPARTY_BUILD)
+  # LYX_3RDPARTY_BUILD is not cached anymore, but for compatibility reasons
+  # this enables the build of all 3rd_party libs
+  set(LYX_EXTERNAL_Z        OFF CACHE BOOL "Build 3rdparty lib zlib"    FORCE)
+  set(LYX_EXTERNAL_ICONV    OFF CACHE BOOL "Build 3rdparty iconvlib"    FORCE)
+  set(LYX_EXTERNAL_HUNSPELL OFF CACHE BOOL "Build 3rdparty hunspelllib" FORCE)
+endif()
+
 macro(setstripped _varname)
 	if(${ARGC} GREATER 1)
 		string(STRIP "${ARGV1}" _v)
@@ -266,7 +347,11 @@ foreach(_c_l ${_config_lines} )
 			set(LYX_PATCH_VERSION ${CMAKE_MATCH_4})
 			set(LYX_DIR_VER "LYX_DIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
 			set(LYX_USERDIR_VER "LYX_USERDIR_${CMAKE_MATCH_1}${CMAKE_MATCH_2}x")
-			set(LYX_INSTALL_SUFFIX "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}")
+			if ("${LYX_SUFFIX_VALUE}" MATCHES "")
+			  set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
+			else()
+			  set(LYX_INSTALL_SUFFIX "${LYX_SUFFIX_VALUE}")
+			endif()
 		endif()
 	endif()
 	if(_c_l MATCHES "^AC_SUBST\\( *LYX_DATE *, *\\[\\\"(.*)\\\"\\].*")
@@ -274,63 +359,85 @@ foreach(_c_l ${_config_lines} )
 	endif()
 endforeach(_c_l)
 
-if (LYX_LOCALVERSIONING)
-	# Find the revision number and for later use
-	FIND_PROGRAM(LYX_GITVERSION git)
-	#message(STATUS "gitversion = ${LYX_GITVERSION}")
-	if(LYX_GITVERSION)
-		EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
-                WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-		if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
-		  # We will add offset of 40000 to get appropriate value to
-		  # previous svn.
-		  # We use this value than also to set the package-patch-value
-		  MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
-		  set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git")
-                  set(ENABLE_DIST ON)
-		endif()
-	else()
-		set(LYX_REVISION_VERSION git) #TODO use date
-	endif()
-else()
-	set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
+FIND_PROGRAM(LYX_GITVERSION git)
+#message(STATUS "gitversion = ${LYX_GITVERSION}")
+set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
+if(LYX_GITVERSION)
+  if (LYX_LOCALVERSIONING)
+    # Find the revision number and for later use
+    EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
+      WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-.*$")
+      # We will add offset of 40000 to get appropriate value to
+      # previous svn.
+      # We use this value than also to set the package-patch-value
+      MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
+      set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git")
+      set(ENABLE_DIST ON)
+    endif()
+  endif()
 endif()
 
-if(LYX_PROGRAM_SUFFIX)
+# Set the programs (lyx, tex2lyx, etc.) suffix
+# When building an OS X bundle, we will append
+# the suffix only to the bundle, not to the programs
+set(PROGRAM_SUFFIX "")
+if(LYX_PROGRAM_SUFFIX AND NOT (APPLE AND LYX_BUNDLE))
 	set(PROGRAM_SUFFIX "${LYX_INSTALL_SUFFIX}")
-else()
-	set(PROGRAM_SUFFIX "")
 endif()
+set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
+set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
 
 add_custom_target(lyx_version ALL
   COMMAND ${CMAKE_COMMAND} -DTOP_SRC_DIR=${TOP_SRC_DIR} -DTOP_CMAKE_PATH=${TOP_CMAKE_PATH} -DTOP_BINARY_DIR=${TOP_BINARY_DIR} -DLYX_DATE=${LYX_DATE} -P ${TOP_SCRIPT_PATH}/LyXGetVersion.cmake
   )
 set_target_properties(lyx_version PROPERTIES FOLDER "applications")
 
-if(APPLE)
-	set(osx_bundle_program_name ${PACKAGE_BASE}${PROGRAM_SUFFIX})
-	configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
-endif()
+# Default paths for installed utilities (tex2lyx, lyxclient, etc.)
+set(LYX_UTILITIES_INSTALL_PATH bin)
 
 if(LYX_BUNDLE)
 	set(LYX_CPACK ON)
+
 	message(STATUS)
 	message(STATUS "Bundle creation is enabled (experimental):")
 	message(STATUS "    make")
 	message(STATUS "    make install/strip")
 	message(STATUS "    make package")
 	if(APPLE)
+		set(MACOSX_BUNDLE TRUE)
+		# This sets the bundle + executable names
+		set(_lyx "${PACKAGE_BASE}${LYX_INSTALL_SUFFIX}")
+		# This sets the Info.plist executable name
+		set(osx_bundle_program_name ${_lyx})
+		# Bundle name
+		set(LYX_BUNDLE_NAME ${_lyx})
+
+		# This will contain the list of files that need to be included
+		# in the bundle and their location within the bundle
+		set(OSX_BUNDLE_FILES "${TOP_SRC_DIR}/development/MacOSX/LyX.sdef;${TOP_SRC_DIR}/development/MacOSX/LyXapp.icns;${CMAKE_BINARY_DIR}/lyxrc.dist")
+		set(OSX_BUNDLE_DIRS "Resources;Resources;Resources")
+
+		# Process Info.plist and lyxrc.dist
+		configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/Info.plist.in" "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
+		configure_file("${CMAKE_CURRENT_SOURCE_DIR}/development/MacOSX/lyxrc.dist.in" "${CMAKE_CURRENT_BINARY_DIR}/lyxrc.dist")
+
 		set(LYX_BUILD_BUNDLE MACOSX_BUNDLE)
-		set(CPACK_BUNDLE_NAME ${PACKAGE_BASE}${PROGRAM_SUFFIX})
+		set(LYX_DATA_SUBDIR ${LYX_BUNDLE_NAME}.app/Contents/Resources/ CACHE STRING "Bundle Contents dir" FORCE)
+
+		# Variables used by CPack
+		set(CPACK_BUNDLE_NAME ${LYX_BUNDLE_NAME})
 		set(CPACK_BUNDLE_PLIST "${CMAKE_CURRENT_BINARY_DIR}/Info.plist")
-		set(LYX_DATA_SUBDIR ${PACKAGE_BASE}${PROGRAM_SUFFIX}.app/Contents/Resources/ CACHE STRING "Bundle Contents dir" FORCE)
-		set(MACOSX_BUNDLE_STARTUP_COMMAND ${PACKAGE_BASE}${PROGRAM_SUFFIX}.app)
+		set(MACOSX_BUNDLE_STARTUP_COMMAND ${LYX_BUNDLE_NAME}.app)
+
+		# Set the install paths
+		set(LYX_UTILITIES_INSTALL_PATH ${LYX_BUNDLE_NAME}.app/Contents/MacOS)
 		if(NOT LYX_INSTALL_PREFIX)
 			set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/LyX CACHE PATH "Mac bundle dir" FORCE)
 			set(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 		endif()
 		# Change the owner so that the install can work
-		install(CODE "set(BU_CHMOD_BUNDLE_ITEMS 1)")
+		install(CODE "set(BU_CHMOD_BUNDLE_ITEMS 1)" COMPONENT Runtime)
 	elseif(UNIX)
 		message(STATUS "To embed Qt in this bundle don't build with your system Qt:")
 		message(STATUS "  - fix PATH so a other qmake is found by cmake")
@@ -346,28 +453,31 @@ if(LYX_INSTALL_PREFIX)
 endif()
 set(LYX_INSTALL_PREFIX ${LYX_INSTALL_PREFIX} CACHE PATH "LyX user's choice install prefix" FORCE)
 
+if(UNIX)
+  set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}/share")
+elseif(CMAKE_INSTALL_PREFIX MATCHES "/lyx${LYX_INSTALL_SUFFIX}$")
+  string(REGEX REPLACE "/lyx${LYX_INSTALL_SUFFIX}$" "/share" SYSTEM_DATADIR ${CMAKE_INSTALL_PREFIX})
+else()
+  set(SYSTEM_DATADIR "${CMAKE_INSTALL_PREFIX}")
+endif()
+
 if(LYX_PACKAGE_SUFFIX)
 	set(PACKAGE ${PACKAGE_BASE}${LYX_INSTALL_SUFFIX})
 else()
 	set(PACKAGE ${PACKAGE_BASE})
 endif()
 
-
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
 	# see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
 	if (UNIX)
-		# don't use the default "/usr/local"
+		# use the default "/usr/local"
 		# but respect the user-choice on the command-line
-		if(LYX_INSTALL_SUFFIX)
-			set(CMAKE_INSTALL_PREFIX "/usr/local/lyx${LYX_INSTALL_SUFFIX}" CACHE PATH "LyX default install prefix" FORCE)
-		else()
-			set(CMAKE_INSTALL_PREFIX "/usr/local/${LYX_PROJECT}" CACHE PATH "LyX default install prefix" FORCE)
-		endif()
-	endif()
-	if(WIN32)
-		set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE)
+		set(CMAKE_INSTALL_PREFIX "/usr/local" CACHE PATH "LyX default install prefix" FORCE)
 	endif()
 endif()
+if(WIN32)
+	set(CMAKE_INSTALL_PREFIX LYX_INSTALLED CACHE PATH "LyX default install prefix" FORCE)
+endif()
 if(IS_ABSOLUTE)
 	set(CMAKE_INSTALL_PREFIX_ABSOLUTE ${CMAKE_INSTALL_PREFIX})
 else()
@@ -380,17 +490,26 @@ if(NOT LYX_DATA_SUBDIR)
 	if (WIN32)
 		set(LYX_DATA_SUBDIR "Resources/" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
 	else()
-		set(LYX_DATA_SUBDIR "" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
+		set(LYX_DATA_SUBDIR "share/${_lyx}/" CACHE STRING "Subdirectory for all lyx-system-data" FORCE)
 	endif()
 endif()
 
 set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
-set(LYX_LOCALEDIR "locale")
-set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}")
+get_locale_destination(LYX_LOCALEDIR)
+set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
-set(LYX_MAN_DIR "/usr/local/man" CACHE STRING
-  "Install location for man pages.")
+if(LYX_BUNDLE AND APPLE)
+	set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.")
+else()
+	if(WIN32)
+		set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man" CACHE STRING "Install location for man pages.")
+	elseif(UNIX)
+		set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE STRING "Install location for man pages.")
+	else()
+		set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man" CACHE STRING "Install location for man pages.")
+	endif()
+endif()
 mark_as_advanced(LYX_MAN_DIR)
 
 if(LYX_INSTALL AND WIN32)
@@ -407,8 +526,8 @@ if(NOT GROUP_CODE)
 endif()
 
 # lyx's source files
-set(LYX_CPP_FILES *.cpp)
-set(LYX_HPP_FILES *.h)
+set(LYX_CPP_FILES [a-zA-Z]*.cpp)
+set(LYX_HPP_FILES [a-zA-Z]*.h)
 set(LYX_MOC_FILES moc_*.cpp)
 
 include(ProjectSourceGroup)
@@ -454,12 +573,17 @@ if(NOT MSVC)
 		set(CMAKE_VERBOSE_MAKEFILE ON)
 	endif()
 	set(LYX_CXX_FLAGS "-Wall -Wunused-parameter ${LYX_GCC11_MODE}")
+	if(LYX_CXX_FLAGS MATCHES "\\+\\+(14|11|98)")
+	  # Thanks to Brad King <brad.king@kitware.com>
+	  # for the pointer to https://cmake.org/cmake/help/v3.6/variable/CMAKE_CXX_STANDARD.html
+	  # This allows us to use QT5.7 with recent g++ (version >= 4.9) compilers
+	  # and still use our own c++ extension tests
+	  set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1})
+	  message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
+	endif()
 	if(LYX_STDLIB_DEBUG)
 		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
 	endif()
-	if(LYX_CONCEPT_CHECKS)
-		set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCPP_CONCEPT_CHECKS")
-	endif()
 	set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
 	set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g3 -D_DEBUG" CACHE TYPE STRING FORCE)
 	if(MINGW)
@@ -477,20 +601,40 @@ if(LYX_CXX_FLAGS_EXTRA)
 	endforeach()
 endif()
 
-find_package(Qt5Core QUIET)
-if (Qt5Core_FOUND)
-	find_package(Qt5Widgets REQUIRED)
-	set(QTVERSION ${Qt5Core_VERSION})
-	macro (qt_use_modules)
-		qt5_use_modules(${ARGN})
-	endmacro()
-	macro (qt_add_resources)
-		qt5_add_resources(${ARGN})
-	endmacro()
-	macro (qt_wrap_uifiles)
-		qt5_wrap_ui(${ARGN})
-	endmacro()
-else()
+if(LYX_XMINGW)
+	list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
+endif()
+
+if(LYX_USE_QT MATCHES "QT5")
+	# set QPA_XCB if QT uses X11
+	find_package(Qt5Core REQUIRED)
+	if (Qt5Core_FOUND)
+		find_package(Qt5Widgets REQUIRED)
+		if(APPLE)
+			find_package(Qt5MacExtras REQUIRED)
+		endif()
+		find_package(Qt5X11Extras QUIET)
+		find_package(Qt5WinExtras QUIET)
+		set(QTVERSION ${Qt5Core_VERSION})
+		macro (qt_use_modules)
+			qt5_use_modules(${ARGN})
+		endmacro()
+		macro (qt_add_resources)
+			qt5_add_resources(${ARGN})
+		endmacro()
+		macro (qt_wrap_uifiles)
+			qt5_wrap_ui(${ARGN})
+		endmacro()
+		message(STATUS "Found Qt-Version ${QTVERSION}")
+		if(WIN32)
+			set(LYX_QTMAIN_LIBRARY ${Qt5Core_QTMAIN_LIBRARIES})
+		endif()
+	endif()
+elseif(LYX_USE_QT MATCHES "QT4")
+	if(LYX_XMINGW)
+		set(QT_MINGW_DIR ${LYX_QT4} CACHE PATH "Qt for Mingw" FORCE)
+		list(APPEND CMAKE_FIND_ROOT_PATH ${QT_MINGW_DIR} ${GNUWIN32_DIR})
+	endif()
 	find_package(Qt4 "4.5.0" REQUIRED)
 	macro (qt_use_modules)
 	endmacro()
@@ -500,6 +644,11 @@ else()
 	macro (qt_wrap_uifiles)
 		qt4_wrap_ui(${ARGN})
 	endmacro()
+	if(WIN32)
+		set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARIES})
+	endif()
+else()
+  message(FATAL_ERROR "Unhandled value for LYX_USE_QT (${LYX_USE_QT})")
 endif()
 
 find_package(Magic)
@@ -509,23 +658,59 @@ endif()
 
 include_directories(${TOP_BINARY_DIR} ${TOP_SRC_DIR}/src)
 
-if(LYX_ASPELL)
-	find_package(ASPELL)
-	include_directories(${ASPELL_INCLUDE_DIR})
+set(Spelling_FOUND OFF)
+set(Include_used_spellchecker)   # String will be inserted into config.h
+
+if(NOT LYX_EXTERNAL_HUNSPELL)
+    add_subdirectory(3rdparty/hunspell)
+    add_definitions(-DHUNSPELL_STATIC)
+    set(HUNSPELL_FOUND ON)
+    message(STATUS "  * Hunspell:")
+    message(STATUS "     - include: ${HUNSPELL_INCLUDE_DIR}")
+    message(STATUS "     - library: ${HUNSPELL_LIBRARY}")
 endif()
 
-if(LYX_ENCHANT)
-	find_package(Enchant REQUIRED)
-	include_directories(${ENCHANT_INCLUDE_DIR})
+foreach(_spell "ASPELL" "Enchant" "Hunspell")
+  string(TOUPPER ${_spell} _upspell)
+  if (NOT ${_upspell}_FOUND)
+    find_package(${_spell})
+  endif()
+  if (${_upspell}_FOUND)
+    include_directories(${${_upspell}_INCLUDE_DIR})
+    set(Spelling_FOUND ON)
+    message(STATUS "Building with USE_${_upspell}")
+    set(Include_used_spellchecker "${Include_used_spellchecker}#define USE_${_upspell} 1\n")
+  else()
+    if(LYX_${_upspell})
+      message(FATAL_ERROR "Required ${_spell} devel package not found")
+    else()
+      message(STATUS "${_upspell} not found, building without ${_spell} support")
+    endif()
+  endif()
+endforeach()
+
+if(GNUWIN32_DIR)
+	list(APPEND CMAKE_PROGRAM_PATH "${GNUWIN32_DIR}/Python" )
+endif()
+
+find_package(PythonInterp 2.7 QUIET)
+if(PYTHONINTERP_FOUND)
+	if(PYTHON_VERSION_STRING VERSION_GREATER 2.8)
+	unset(PYTHONINTERP_FOUND)
+	endif()
 endif()
 
-if(LYX_HUNSPELL)
-	find_package(Hunspell REQUIRED)
-	include_directories(${HUNSPELL_INCLUDE_DIR})
+if(NOT PYTHONINTERP_FOUND)
+  unset(PYTHON_EXECUTABLE CACHE)
+  unset(PYTHON_VERSION_MAJOR)
+  unset(PYTHON_VERSION_MINOR)
+  unset(PYTHON_VERSION_STRING)
+  find_package(PythonInterp 3.3 REQUIRED)
 endif()
 
+set(LYX_PYTHON_EXECUTABLE ${PYTHON_EXECUTABLE} CACHE FILEPATH "Python to be used by LyX")
+
 if(LYX_NLS)
-	FIND_PROGRAM(LYX_PYTHON_EXECUTABLE python2 python HINTS ${GNUWIN32_DIR}/python)
 	find_package(LyXGettext)
 	if(LYX_PYTHON_EXECUTABLE AND GETTEXT_FOUND)
 		add_subdirectory(po "${TOP_BINARY_DIR}/po")
@@ -535,48 +720,70 @@ if(LYX_NLS)
 		message(STATUS "Installing provided .gmo-files only")
 		foreach( _gmo ${_gmofiles})
 			string(REGEX REPLACE "\\.gmo$" "" _lang ${_gmo})
-			install(FILES "${TOP_SRC_DIR}/po/${_gmo}" DESTINATION ${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${PACKAGE}.mo)
+			install(FILES "${TOP_SRC_DIR}/po/${_gmo}" DESTINATION ${LYX_LOCALEDIR}/${_lang}/LC_MESSAGES RENAME ${PACKAGE}.mo)
 		endforeach()
 	endif()
 endif()
 
-find_package(ICONV REQUIRED)
-find_package(ZLIB REQUIRED)
+if(LYX_EXTERNAL_ICONV)
+  find_package(ICONV REQUIRED)
+else()
+  add_subdirectory(3rdparty/libiconv)
+  set(HAVE_ICONV_CONST 1)
+endif()
+
+if(LYX_EXTERNAL_Z)
+  find_package(ZLIB REQUIRED)
+else()
+  add_subdirectory(3rdparty/zlib)
+endif()
 
 if(LYX_EXTERNAL_BOOST)
 	message(STATUS "Searching for boost")
-	find_package(Boost COMPONENTS signals regex) #TODO could REQUIRED be used
+	if(NOT LYX_USE_STD_REGEX)
+		find_package(Boost COMPONENTS regex)
+	endif()
 	if(Boost_FOUND)
 		message(STATUS "Boost found")
 		message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
 		set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
+		if (LYX_STDLIB_DEBUG)
+			# Comment from 	Jean-Marc Lasgouttes:
+			# In general, system boost libraries are incompatible with
+			# the use of stdlib-debug in libstdc++. See ticket #9736 for
+			# details.
+			message(WARNING "Compiling LyX with stdlib-debug and system boost libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF' or using '-DLYX_EXTERNAL_BOOST=OFF'")
+		endif()
 	else()
 		message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
 	endif()
 else()
-	if(LYX_USE_TR1_REGEX)
-		set(Lyx_Boost_Libraries boost_signals)
-	else()
-		set(Lyx_Boost_Libraries boost_signals boost_regex)
+	if(NOT LYX_USE_STD_REGEX)
+		set(Lyx_Boost_Libraries boost_regex)
 	endif()
 	add_definitions(-DBOOST_USER_CONFIG="<config.h>")
-	include_directories(${TOP_SRC_DIR}/boost)
-	add_subdirectory(boost "${TOP_BINARY_DIR}/boost")
+	include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+	add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
 endif()
 
 
 
 
 if(WIN32)
-	if(NOT LYX_CONSOLE)
+	if(LYX_CONSOLE)
+		set(LYX_QTMAIN_LIBRARY)
+	else()
 		set(WIN32_CONSOLE WIN32)
-		set(LYX_QTMAIN_LIBRARY ${QT_QTMAIN_LIBRARY})
 	endif()
 	if(MSVC)
-		add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
+		# -DPSAPI_VERSION=1 is needed to run on vista (bug 10186)
+		add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX -DPSAPI_VERSION=1)
 		# 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()
+		# -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
+		# does not use it and always declares the vista compatible API.
+		# If this ever changes then -DPSAPI_VERSION might be needed here as well. 
 		add_definitions(-DWINVER=0x0500)
 	endif()
 endif()
@@ -613,8 +820,8 @@ if(LYX_PCH)
 				COMPILE_FLAGS "/Ycconfig.h /Fp\$(IntDir)/config.pch")
 			set(${name_}_sources ${${name_}_sources} ${TOP_BINARY_DIR}/config_pch.cpp
 				${TOP_BINARY_DIR}/pcheaders.h)
-			set(CMAKE_CXX_FLAGS_DEBUG	"${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
-			set(CMAKE_CXX_FLAGS_RELEASE	"${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT4")
+			set(CMAKE_CXX_FLAGS_DEBUG	"${CMAKE_CXX_FLAGS_DEBUG} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT")
+			set(CMAKE_CXX_FLAGS_RELEASE	"${CMAKE_CXX_FLAGS_RELEASE} /DLYX_PCH_STL /DLYX_PCH_BOOST /DLYX_PCH_QT")
 			set(CMAKE_CXX_FLAGS_MINSIZEREL	"${CMAKE_CXX_FLAGS_MINSIZEREL} /DLYX_PCH_STL /DLYX_PCH_BOOST")
 		endmacro(lyx_add_msvc_pch)
 		macro(lyx_add_gcc_pch name_)
@@ -623,7 +830,7 @@ if(LYX_PCH)
 		macro(lyx_add_msvc_pch name_)
 		endmacro()
 		macro(lyx_add_gcc_pch name_)
-			add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT4)
+			add_definitions(-DLYX_PCH_STL -DLYX_PCH_BOOST -DLYX_PCH_QT)
 			ADD_PRECOMPILED_HEADER(${name_} ${TOP_BINARY_DIR}/config_pch.cpp ${TOP_BINARY_DIR}/config.h.gch)
 		endmacro()
 	endif()
@@ -723,13 +930,9 @@ if (WIN32 AND Qt5Core_FOUND)
 	set(Z_PREFIX 1)
 endif()
 
-# compiler tests, config.h generation
-if(MSVC AND NOT LYX_CONFIGURE_CHECKS)
-	configure_file(${LYX_CMAKE_DIR}/configCompiler.h.msvc ${TOP_BINARY_DIR}/configCompiler.h)
-else()
-	include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
-	configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
-endif()
+# compiler tests, config.h generation LYX_CONFIGURE_CHECKS
+include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
+configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
 
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
 
@@ -737,8 +940,10 @@ if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
 	MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")
 endif()
 
-set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
-set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
+if (NOT HAVE_REGEX)
+	set(LYX_USE_STD_REGEX 0)
+endif()
+
 
 set (cmd ${CMAKE_CTEST_COMMAND})
 if (MSVC)
@@ -749,25 +954,32 @@ endif ()
 add_custom_target (lyx_run_tests COMMAND ${cmd})
 set_target_properties(lyx_run_tests PROPERTIES FOLDER "tests")
 
-
-add_subdirectory(src "${TOP_BINARY_DIR}/src")
-add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
-add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
-add_subdirectory(lib/examples "${TOP_BINARY_DIR}/lib/examples")
-
+if(LYX_ASAN)
+    set(LYX_CXX_FLAGS "-fsanitize=address -fno-omit-frame-pointer -g")
+    message(STATUS)
+    message(STATUS "Address sanitizer enabled. Usage:")
+    message(STATUS "    wget https://llvm.org/svn/llvm-project/compiler-rt/trunk/lib/asan/scripts/asan_symbolize.py")
+    message(STATUS "    chmod  +x ./asan_symbolize.py")
+    message(STATUS "    ./bin/lyx2.2 2>&1 | ./asan_symbolize.py  | c++filt ")
+    message(STATUS)
+endif()
 
 if(LYX_INSTALL)
 	if(${LYX_PYTHON_EXECUTABLE} MATCHES "-NOTFOUND")
 		message(STATUS "Python required to create doc!")
 	else()
-		add_subdirectory(${LYX_CMAKE_DIR}/man "${TOP_BINARY_DIR}/man")
+		if(UNIX)
+			add_subdirectory(${LYX_CMAKE_DIR}/man "${TOP_BINARY_DIR}/man")
+		endif()
 		add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc")
 	endif()
-	if(NOT(LYX_BUNDLE AND APPLE))
-		include(../Install)
-	endif()
+	include(../Install)
 endif()
 
+add_subdirectory(src "${TOP_BINARY_DIR}/src")
+add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")
+add_subdirectory(lib/scripts "${TOP_BINARY_DIR}/scripts")
+add_subdirectory(lib/examples "${TOP_BINARY_DIR}/lib/examples")
 add_subdirectory(sourcedoc "${TOP_BINARY_DIR}/sourcedoc")
 add_subdirectory(development/autotests "${TOP_BINARY_DIR}/autotests")
 if(LYX_ENABLE_URLTESTS)
@@ -775,8 +987,9 @@ if(LYX_ENABLE_URLTESTS)
 endif()
 
 message(STATUS)
-message(STATUS "Build options, switch LYX_* variables by -DLYX_*=ON or OFF:")
+message(STATUS "Build params, switch LYX_* options by -DLYX_*=ON or OFF, LYX_* combos by -DLYX_*=value:")
 message(STATUS)
+
 LYX_OPTION_LIST_ALL(used)
 
 
@@ -785,14 +998,25 @@ if(LYX_NLS)
 	message(STATUS "Building Native Language Support (LYX_NLS is set), used libraries:")
 	message(STATUS)
 	message(STATUS "  * iconv")
-	message(STATUS "     - header : ${ICONV_HEADER}")
+	message(STATUS "     - include: ${ICONV_INCLUDE_DIR}")
 	message(STATUS "     - library: ${ICONV_LIBRARY}")
 	message(STATUS "  * zlib")
-	message(STATUS "     - header : ${ZLIB_HEADER}")
+	message(STATUS "     - include: ${ZLIB_INCLUDE_DIR}")
 	message(STATUS "     - library: ${ZLIB_LIBRARY}")
 	message(STATUS)
 endif()
 
+# Apple has builtin native spell checker,
+# no need to warn for missing Aspell, Hunspell or Enchant
+if(NOT Spelling_FOUND AND NOT APPLE)
+  if(LYX_REQUIRE_SPELLCHECK)
+    set(_mode "FATAL_ERROR")
+  else()
+    set(_mode "STATUS")
+  endif()
+  message(${_mode} "No spellcheck libraries found. LyX will be unable use spellchecking")
+endif()
+
 include("${TOP_CMAKE_PATH}/LyxPackaging.cmake")
 
 if(ENABLE_DIST)
@@ -812,4 +1036,8 @@ if(ENABLE_DIST)
   add_custom_target(git-archive DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${DIST_NAME})
 endif()
 
+# Last directory to be included so that the fixup code (OS X)
+# can be run last
+add_subdirectory(development/cmake/post_install)
+
 message(STATUS)