X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=1e0b9c3ef2d3a8ed7ee15fd79baec545e5cf1042;hb=b8648dea168f59b722cd0f16c8557c9c2e44682b;hp=e3dfa48f7e20f4e956b90f6538eadc26b6e39f5e;hpb=6fa12b09718bb1709f0c613c2fb8f40b71f1e147;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e3dfa48f7e..1e0b9c3ef2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,9 @@
 cmake_minimum_required(VERSION 2.6.4)
 
 
-set(LYX_PROJECT lyx)
+set(LYX_PROJECT LyX)
+
+enable_testing()
 
 set(LYX_CMAKE_DIR "development/cmake")
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/${LYX_CMAKE_DIR}/modules")
@@ -264,6 +266,12 @@ if (LYX_LOCALVERSIONING)
 		  MATH(EXPR tmp_REVISION_VERSION "(${CMAKE_MATCH_1}+40000)")
 		  set(LYX_REVISION_VERSION "${LYX_PATCH_VERSION}-${tmp_REVISION_VERSION}git")
 		endif()
+		# Override the value from configure.ac, if possible
+		EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "log" "-1" "--format=%ci"
+			WORKING_DIRECTORY "${TOP_SRC_DIR}"
+			OUTPUT_VARIABLE LYX_DATEtmp OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+		string(REGEX MATCH "([0-9]+-[0-9]+-[0-9]+)" LYX_DATE ${LYX_DATEtmp})
 	else()
 		set(LYX_REVISION_VERSION git) #TODO use date
 	endif()
@@ -278,6 +286,11 @@ else()
 endif()
 
 
+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()
+
 if(LYX_BUNDLE)
 	set(LYX_CPACK ON)
 	message(STATUS)
@@ -287,12 +300,16 @@ if(LYX_BUNDLE)
 	message(STATUS "    make package")
 	if(APPLE)
 		set(LYX_BUILD_BUNDLE MACOSX_BUNDLE)
+		set(CPACK_BUNDLE_NAME ${PACKAGE_BASE}${PROGRAM_SUFFIX})
+		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)
 		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)")
 	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")
@@ -458,7 +475,6 @@ if(LYX_NLS)
 		message(FATAL_ERROR "Python 2.6 needed!")
 	endif()
 	find_package(LyXGettext REQUIRED)
-	include_directories(${TOP_SRC_DIR}/po)
 	add_subdirectory(po "${TOP_BINARY_DIR}/po")
 endif()
 
@@ -476,6 +492,12 @@ if(LYX_NLS)
 	endif()
 endif()
 
+if(LYX_EXTERNAL_LIBINTL)
+	set(intl_link ${LIBINTL_LIBRARIES})
+else()
+	set(intl_link intl)
+endif()
+
 find_package(ICONV REQUIRED)
 find_package(ZLIB REQUIRED)
 
@@ -659,6 +681,7 @@ else()
 endif()
 
 configure_file(${LYX_CMAKE_DIR}/config.h.cmake ${TOP_BINARY_DIR}/config.h)
+configure_file(${LYX_CMAKE_DIR}/lyx_date.h.cmake ${TOP_BINARY_DIR}/lyx_date.h)
 
 # Compute qt4-version from ${QTVERSION}
 if(QTVERSION MATCHES "^([0-9]+)\\.([0-9]+)\\.([0-9]+).*")
@@ -678,7 +701,9 @@ if(LYX_INSTALL)
 		add_subdirectory(${LYX_CMAKE_DIR}/man "${TOP_BINARY_DIR}/man")
 		add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc")
 	endif()
-	include(../Install)
+	if(NOT(LYX_BUNDLE AND APPLE))
+		include(../Install)
+	endif()
 endif()
 
 add_subdirectory(sourcedoc "${TOP_BINARY_DIR}/sourcedoc")