X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=552654b91848911b7ea94a8f53bd709558f2e5f7;hb=2a2f15ec03e1771a5d9ac26d0c71784de4d8e5f1;hp=fbcc460de7d4dd0dc40047dbd3444d7a44f1fcdc;hpb=3a29ba795d38c9d17de687d22752f9c94b395d49;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbcc460de7..552654b918 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,7 +49,7 @@ if(COMMAND cmake_policy)
 	endif()
 	cmake_policy(SET CMP0020 NEW)
 	if(POLICY CMP0075)
-        	cmake_policy(SET CMP0075 OLD)
+		cmake_policy(SET CMP0075 NEW)
 	endif()
 endif()
 
@@ -139,13 +139,19 @@ 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)
+if (NOT CMAKE_VERSION VERSION_LESS "3.17")
+LYX_OPTION(ENABLE_VALGRIND_TESTS  "Enable for tests involving valgrind" OFF ALL)
+else()
+unset(LYX_ENABLE_VALGRIND_TESTS CACHE)
+endif()
 LYX_OPTION(ASAN             "Use address sanitizer" OFF ALL)
-LYX_COMBO(USE_FILEDIALOG    "Use native or QT file dialog" QT NATIVE)
+#LYX_COMBO(USE_FILEDIALOG    "Use native or QT file dialog" QT NATIVE)
 LYX_COMBO(USE_QT            "Use Qt version as frontend" AUTO QT4 QT5)
 LYX_COMBO(USE_IPO           "Interprocedural optimization" OFF AUTO ON)
 #LYX_OPTION(3RDPARTY_BUILD   "Build 3rdparty libs" OFF ALL)
 LYX_OPTION(DISABLE_CALLSTACK_PRINTING "do not print a callstack when crashing" OFF ALL)
 LYX_OPTION(EXTERNAL_Z       "OFF := Build 3rdparty lib zlib" ON ALL)
+LYX_OPTION(EXTERNAL_DTL     "OFF := Build 3rdparty commands dt2dv and dv2dt" ON ALL)
 LYX_OPTION(EXTERNAL_ICONV   "OFF := Build 3rdparty lib iconvlib" ON ALL)
 LYX_OPTION(EXTERNAL_HUNSPELL "OFF := Build 3rdparty lib hunspelllib" ON ALL)
 LYX_COMBO(EXTERNAL_MYTHES   "OFF := Build 3rdparty lib mytheslib" AUTO OFF ON)
@@ -179,6 +185,17 @@ if(help OR HELP)
 endif()
 
 # Check option dependencies
+if (LYX_ENABLE_VALGRIND_TESTS)
+	find_program(VALGRIND_EXECUTABLE "valgrind")
+	if (NOT VALGRIND_EXECUTABLE)
+		message(FATAL_ERROR "Cannot use valgrind tests, executable valgrind is missing. Please disable LYX_ENABLE_VALGRIND_TESTS")
+	endif()
+endif()
+if (LYX_DEBUG_GLIBC OR LYX_DEBUG_GLIBC_PEDANTIC OR LYX_STDLIB_DEBUG)
+  if (LYX_EXTERNAL_BOOST)
+    message(FATAL_ERROR "Using external boost not compatible with debug mode for stdlib")
+  endif()
+endif()
 
 if(LYX_DMG)
 	set(LYX_BUNDLE ON)
@@ -275,7 +292,7 @@ find_package(CXX11Compiler)
 if(NOT CXX11COMPILER_FOUND)
 	message(FATAL_ERROR "A C++11 compatible compiler is required.")
 endif()
-set(LYX_GCC11_MODE)
+unset(LYX_GCC11_MODE)
 if(UNIX OR MINGW)
 	if (CMAKE_CXX_COMPILER_ID MATCHES "^([cC]lang|AppleClang)$")
 	  # ignore the GCC_VERSION for clang
@@ -317,8 +334,6 @@ else()
 endif()
 
 
-set(VERSION_INFO "CMake Build")
-
 # Try to get some informations from configure.ac
 
 include(LyXPaths)
@@ -371,12 +386,20 @@ foreach(_c_l ${_config_lines} )
 		setstripped(PACKAGE_BASE ${_PB})
 		setstripped(PACKAGE_VERSION ${_PV})
 		setstripped(PACKAGE_BUGREPORT ${_PBU})
-		if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\)?.*$")
+		if(PACKAGE_VERSION MATCHES "^\([0-9]+\)\\.\([0-9]+\)\(\\.\([0-9]+\)\(\\.\([0-9]+\)\)?\)?.*$")
 			set(LYX_MAJOR_VERSION ${CMAKE_MATCH_1})
 			set(LYX_MINOR_VERSION ${CMAKE_MATCH_2})
-			set(LYX_RELEASE_VERSION ${CMAKE_MATCH_4})
+			set(LYX_RELEASE_LEVEL ${CMAKE_MATCH_4})
+			set(LYX_RELEASE_PATCH ${CMAKE_MATCH_6})
 			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")
+			if (NOT LYX_RELEASE_LEVEL)
+				set(LYX_RELEASE_LEVEL 0)
+			endif()
+			if (NOT LYX_RELEASE_PATCH)
+				set(LYX_RELEASE_PATCH 0)
+			endif()
+			set(LYX_VERSION "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
 			if ("${LYX_SUFFIX_VALUE}" MATCHES "")
 			  set(LYX_INSTALL_SUFFIX "${LYX_MAJOR_VERSION}.${LYX_MINOR_VERSION}")
 			else()
@@ -388,27 +411,40 @@ foreach(_c_l ${_config_lines} )
 		set(LYX_DATE "${CMAKE_MATCH_1}")
 	endif()
 endforeach(_c_l)
+unset(_config_lines)
 
 FIND_PROGRAM(LYX_GITVERSION git)
 #message(STATUS "gitversion = ${LYX_GITVERSION}")
-set(LYX_REVISION_VERSION ${LYX_RELEASE_VERSION})
-set(LYX_PACKAGE_RELEASE "1")
+set(LYX_REVISION_VERSION ${LYX_RELEASE_LEVEL})
+set(LYX_PACKAGE_RELEASE "UNDEFINED")
 if(LYX_GITVERSION)
   if (LYX_LOCALVERSIONING)
-    # Find the revision number and for later use
+    # Find the revision number for later use
     EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} describe --match 2.0.0 HEAD
-      WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
-    if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
-      set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2})
-      # 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_RELEASE_VERSION}-${tmp_REVISION_VERSION}git")
-      set(ENABLE_DIST ON)
+      WORKING_DIRECTORY "${TOP_SRC_DIR}"
+      RESULT_VARIABLE tmp_GIT_RESULT
+      OUTPUT_VARIABLE tmp_LYX_PACKAGE_RELEASE
+      ERROR_VARIABLE tmp_GIT_ERROR
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    if (tmp_GIT_RESULT EQUAL 0)
+      if (tmp_LYX_PACKAGE_RELEASE MATCHES "^2\\.0\\.0\\-\([0-9]+\)\\-\(.*\)$")
+	set(LYX_PACKAGE_RELEASE ${CMAKE_MATCH_2})
+	# 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_RELEASE_LEVEL}-${tmp_REVISION_VERSION}git")
+	set(ENABLE_DIST ON)
+      endif()
     endif()
   endif()
 endif()
+if (LYX_PACKAGE_RELEASE MATCHES "UNDEFINED")
+  set(LYX_PACKAGE_RELEASE  "1")
+  if (LYX_RELEASE_PATCH GREATER 0)
+    set(LYX_REVISION_VERSION "${LYX_RELEASE_LEVEL}.${LYX_RELEASE_PATCH}")
+  endif()
+endif()
 
 # Set the programs (lyx, tex2lyx, etc.) suffix
 # When building an OS X bundle, we will append
@@ -545,22 +581,27 @@ if(NOT LYX_DATA_SUBDIR)
 	endif()
 endif()
 
-set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}")
+set(LYX_ABS_INSTALLED_DATADIR "${CMAKE_INSTALL_PREFIX}/${LYX_DATA_SUBDIR}")
 get_locale_destination(LYX_LOCALEDIR)
 set(LYX_ABS_INSTALLED_LOCALEDIR "${CMAKE_INSTALL_PREFIX}/${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
 if(LYX_BUNDLE AND APPLE)
-	set(LYX_MAN_DIR "${LYX_DATA_SUBDIR}" CACHE STRING "Install location for man pages.")
+	set(LYX_MAN_DIR_tmp "${LYX_DATA_SUBDIR}")
 else()
 	if(WIN32)
-		set(LYX_MAN_DIR "${CMAKE_BINARY_DIR}/usr/local/man" CACHE STRING "Install location for man pages.")
+		set(LYX_MAN_DIR_tmp "${CMAKE_BINARY_DIR}/usr/local/man/")
 	elseif(UNIX)
-		set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/share/man" CACHE STRING "Install location for man pages.")
+		set(LYX_MAN_DIR_tmp "${CMAKE_INSTALL_PREFIX}/share/man/")
 	else()
-		set(LYX_MAN_DIR "${CMAKE_INSTALL_PREFIX}/man" CACHE STRING "Install location for man pages.")
+		set(LYX_MAN_DIR_tmp "${CMAKE_INSTALL_PREFIX}/man/")
 	endif()
 endif()
+if (NOT LYX_MAN_DIR_tmp EQUAL "${LYX_MAN_DIR}")
+	unset(LYX_MAN_DIR CACHE)
+	set(LYX_MAN_DIR "${LYX_MAN_DIR_tmp}" CACHE STRING "Install location for man pages.")
+endif()
+unset(LYX_MAN_DIR_tmp)
 mark_as_advanced(LYX_MAN_DIR)
 
 # The Win installer cannot be built by CMake because one needs to install plugins for NSIS
@@ -621,7 +662,12 @@ else()
 	set(library_type STATIC)
 endif()
 
-if(NOT MSVC)
+if(MSVC)
+  if (CXX11_FLAG MATCHES "\\+\\+([0-9]+)")
+    set(CMAKE_CXX_STANDARD ${CMAKE_MATCH_1})
+    message(STATUS "CMAKE_CXX_STANDARD set to ${CMAKE_CXX_STANDARD}")
+  endif()
+else()
 	if(NOT LYX_QUIET)
 		set(CMAKE_VERBOSE_MAKEFILE ON)
 	endif()
@@ -635,7 +681,14 @@ if(NOT MSVC)
 	  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")
+	  set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
+        else()
+          if(LYX_DEBUG_GLIBC)
+            set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG")
+          endif()
+          if(LYX_DEBUG_GLIBC_PEDANTIC)
+            set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG_PEDANTIC")
+          endif()
 	endif()
 	set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE STRING "Set CXX flags" FORCE)
 	set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -D_DEBUG" CACHE STRING "Set debug flags" FORCE)
@@ -771,7 +824,7 @@ if(NOT LYX_EXTERNAL_HUNSPELL)
     message(STATUS "     - library: ${HUNSPELL_LIBRARY}")
 endif()
 
-foreach(_spell "ASPELL" "Enchant" "Hunspell")
+foreach(_spell "ASPELL" "ENCHANT" "HUNSPELL")
   string(TOUPPER ${_spell} _upspell)
   if (NOT ${_upspell}_FOUND)
     find_package(${_spell})
@@ -851,6 +904,10 @@ else()
   add_subdirectory(3rdparty/zlib)
 endif()
 
+if(NOT LYX_EXTERNAL_DTL)
+  add_subdirectory(3rdparty/dtl)
+endif()
+
 if(LYX_USE_STD_REGEX)
   # Set only include path.
   # Use internal boost, which is known to exist
@@ -909,7 +966,7 @@ endif()
 
 message(STATUS "")
 foreach(_v PACKAGE PACKAGE_VERSION
-	PROGRAM_SUFFIX LYX_DIR_VER LYX_USERDIR_VER
+	PROGRAM_SUFFIX LYX_VERSION LYX_DIR_VER LYX_USERDIR_VER
 	LYX_ABS_TOP_SRCDIR
 	LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)
 	if(NOT DEFINED ${_v})
@@ -1020,14 +1077,6 @@ if(MSVC)
 endif()
 
 
-if(LYX_DEBUG_GLIBC)
-	set(_GLIBCXX_DEBUG ON)
-endif()
-
-if(LYX_DEBUG_GLIBC_PEDANTIC)
-	set(_GLIBCXX_DEBUG_PEDANTIC ON)
-endif()
-
 # Xcode compiler
 if (CMAKE_GENERATOR MATCHES Xcode)
 	if (XCODE_VERSION VERSION_LESS "5.0")
@@ -1051,7 +1100,43 @@ endif()
 include(${LYX_CMAKE_DIR}/ConfigureChecks.cmake)
 configure_file(${LYX_CMAKE_DIR}/configCompiler.h.cmake ${TOP_BINARY_DIR}/configCompiler.h)
 
+unset(opts)
+foreach(_option ${LYX_OPTIONS})
+  if(${_option}_show_message)
+    string(SUBSTRING "${_option}                            " 0 31 _var)
+    get_property(_prop CACHE ${_option} PROPERTY STRINGS)
+    list(FIND LYX_OPTION_STRINGS ${_option} _index)
+    if (${_index} GREATER -1)
+      set(_isset ${${_option}})
+    elseif(${_option})
+      set(_isset ON)
+    else()
+      set(_isset OFF)
+    endif()
+    string(SUBSTRING "${_isset}           " 0 10 _val)
+    set(opts "${opts} ${_option}(${${_option}})")
+  endif()
+endforeach()
+set(tmp_vi "CMake Build")
+list(APPEND tmp_vi "  Host name:               ${CMAKE_HOST_SYSTEM_NAME}")
+list(APPEND tmp_vi "  Host processor:          ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+list(APPEND tmp_vi "  Build flags:             ${opts}")
+list(APPEND tmp_vi "  C++ Compiler:            ${CMAKE_CXX_COMPILER_ID} (${CMAKE_CXX_COMPILER_VERSION})")
+list(APPEND tmp_vi "  C++ Compiler flags:      ${CMAKE_CXX_FLAGS}")
+if (LYX_DEBUG)
+list(APPEND tmp_vi "  C++ Compiler user flags: ${CMAKE_CXX_FLAGS_DEBUG}")
+else()
+list(APPEND tmp_vi "  C++ Compiler user flags: ${CMAKE_CXX_FLAGS_RELEASE}")
+endif()
+list(APPEND tmp_vi "  Qt version:              ${QTVERSION}")
+list(APPEND tmp_vi "  LyX binary dir:          ${CMAKE_INSTALL_PREFIX}/${LYX_UTILITIES_INSTALL_PATH}")
+get_data_destination(dest_data)
+list(APPEND tmp_vi "  LyX files dir:           ${CMAKE_INSTALL_PREFIX}/${dest_data}")
+string(REPLACE ";" "\\n" VERSION_INFO "${tmp_vi}")
+
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
+unset(opts)
+unset(tmp_vi)
 
 if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
 	MATH(EXPR QT4_VERSION "(${CMAKE_MATCH_1}<<16)|(${CMAKE_MATCH_2}<<8)|${CMAKE_MATCH_3}")