X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=023c3e14b71e9d51a766724c9f924e6fffc395b7;hb=eb53788f3a78d12a31478f0522afdcd644645e84;hp=d0fa522e89fe9852d061b2a63b92c2301cd436b0;hpb=22d52f5f08cba82c85019634420f4204da56ec6b;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0fa522e89..023c3e14b7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,7 +23,7 @@ set(CMAKE_MODULE_PATH "${TOP_MODULE_PATH}")
 set(CMAKE_PROJECT_NAME ${LYX_PROJECT})
 
 message(STATUS)
-if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR}) 
+if (${CMAKE_SOURCE_DIR} STREQUAL ${CMAKE_BINARY_DIR})
 	message(STATUS "Building in-source")
 	set(TOP_BINARY_DIR "${CMAKE_BINARY_DIR}/build")
 else()
@@ -31,6 +31,9 @@ else()
 	set(TOP_BINARY_DIR "${CMAKE_BINARY_DIR}")
 endif()
 
+# This directory should be used if some test uses lyx-executable
+set(LYX_TESTS_USERDIR "${TOP_BINARY_DIR}/Testing/.lyx")
+file(MAKE_DIRECTORY "${LYX_TESTS_USERDIR}")
 
 if(COMMAND cmake_policy)
 	cmake_policy(SET CMP0003 OLD)
@@ -93,6 +96,7 @@ LYX_OPTION(MERGE_REBUILD    "Rebuild generated files from merged files build" OF
 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)
 
 # GCC specific
 LYX_OPTION(PROFILE              "Build profile version" OFF GCC)
@@ -209,11 +213,11 @@ if(UNIX OR MINGW)
 		set(LYX_USE_TR1_REGEX 0)
 	endif()
 	if (LYX_ENABLE_CXX11)
-		if(GCC_VERSION VERSION_GREATER 4.7)
-			set(LYX_GCC11_MODE "-std=gnu++11")
-		elseif(GCC_VERSION VERSION_GREATER 4.2)
-			set(LYX_GCC11_MODE "-std=gnu++0x")
+		find_package(CXX11Compiler)
+		if(NOT CXX11COMPILER_FOUND)
+			message(FATAL_ERROR "A C++11 compatible compiler is required.")
 		endif()
+		set(LYX_GCC11_MODE "${CXX11_FLAG}")
 	endif()
 else()
 	if(MSVC10)
@@ -275,7 +279,8 @@ if (LYX_LOCALVERSIONING)
 	FIND_PROGRAM(LYX_GITVERSION git)
 	#message(STATUS "gitversion = ${LYX_GITVERSION}")
 	if(LYX_GITVERSION)
-		EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "describe" WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+		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.
@@ -384,6 +389,9 @@ set(LYX_LOCALEDIR "locale")
 set(LYX_ABS_INSTALLED_LOCALEDIR "${LYX_ABS_INSTALLED_DATADIR}/${LYX_DATA_SUBDIR}${LYX_LOCALEDIR}")
 set(LYX_ABS_TOP_SRCDIR "${TOP_SRC_DIR}")
 
+set(LYX_MAN_DIR "/usr/local/man" CACHE STRING
+  "Install location for man pages.")
+mark_as_advanced(LYX_MAN_DIR)
 
 if(LYX_INSTALL AND WIN32)
 	message(STATUS "Configuring NSIS files")
@@ -438,7 +446,7 @@ endif()
 if(LYX_SHARED_LIBRARIES)
 	set(library_type SHARED)
 else()
- 	set(library_type STATIC)
+	set(library_type STATIC)
 endif()
 
 if(NOT MSVC)
@@ -461,6 +469,14 @@ if(NOT MSVC)
 	endif()
 endif()
 
+set(LYX_CXX_FLAGS_EXTRA "" CACHE STRING "Desired semicolon separated list of extra cxx compile flags, like '-Werror'")
+mark_as_advanced(LYX_CXX_FLAGS_EXTRA)
+if(LYX_CXX_FLAGS_EXTRA)
+	foreach(_flag ${LYX_CXX_FLAGS_EXTRA})
+		add_definitions(${_flag})
+	endforeach()
+endif()
+
 find_package(Qt5Core QUIET)
 if (Qt5Core_FOUND)
 	find_package(Qt5Widgets REQUIRED)
@@ -690,16 +706,17 @@ endif()
 
 # Xcode compiler
 if (CMAKE_GENERATOR MATCHES Xcode)
-	# Automatically select the Xcode compiler if not set
-	if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
-		# XCode >= 3.1 has gcc 4.2 (up to actual Xcode)
-		if (XCODE_VERSION VERSION_GREATER "3.1")
-			SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
-		ENDIF(XCODE_VERSION VERSION_GREATER "3.1")
-	ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
-
-	# Print the selected compiler version
-    MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
+	if (XCODE_VERSION VERSION_LESS "5.0")
+		# Automatically select the Xcode compiler if not set
+		if (NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
+			# XCode >= 3.1 has gcc 4.2 (up to actual Xcode)
+			if (XCODE_VERSION VERSION_GREATER "3.1")
+				SET(CMAKE_XCODE_ATTRIBUTE_GCC_VERSION "com.apple.compilers.llvmgcc42")
+			ENDIF(XCODE_VERSION VERSION_GREATER "3.1")
+		ENDIF(NOT DEFINED CMAKE_XCODE_ATTRIBUTE_GCC_VERSION)
+		# Print the selected compiler version
+   	MESSAGE(STATUS "---- Using XCode compiler CMAKE_XCODE_ATTRIBUTE_GCC_VERSION=${CMAKE_XCODE_ATTRIBUTE_GCC_VERSION}")
+	ENDIF(XCODE_VERSION VERSION_LESS "5.0")
 ENDIF(CMAKE_GENERATOR MATCHES Xcode)
 
 if (WIN32 AND Qt5Core_FOUND)
@@ -753,6 +770,9 @@ endif()
 
 add_subdirectory(sourcedoc "${TOP_BINARY_DIR}/sourcedoc")
 add_subdirectory(development/autotests "${TOP_BINARY_DIR}/autotests")
+if(LYX_ENABLE_URLTESTS)
+	add_subdirectory(development/checkurls "${TOP_BINARY_DIR}/checkurls")
+endif()
 
 message(STATUS)
 message(STATUS "Build options, switch LYX_* variables by -DLYX_*=ON or OFF:")