X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=b445ab7b92fc2b20a3f17513b843f30feb0da90e;hb=63c1979401271381e7667f8e55a018a728788aaa;hp=48cc85a13c87b0a3e19e69f38ff59e1014155cdd;hpb=2fe59adbc89f56e7e192b57c90eb5e2a8338721c;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 48cc85a13c..b445ab7b92 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -359,12 +359,14 @@ endforeach(_c_l)
 FIND_PROGRAM(LYX_GITVERSION git)
 #message(STATUS "gitversion = ${LYX_GITVERSION}")
 set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
+set(LYX_PACKAGE_RELEASE "1")
 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]+\)\\-.*$")
+      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
@@ -384,6 +386,7 @@ if(LYX_PROGRAM_SUFFIX AND NOT (APPLE AND LYX_BUNDLE))
 endif()
 set(_lyx "${PACKAGE_BASE}${PROGRAM_SUFFIX}")
 set(_tex2lyx tex2lyx${PROGRAM_SUFFIX})
+set(_convert lyxconvert${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
@@ -524,13 +527,15 @@ else()
 endif()
 mark_as_advanced(LYX_MAN_DIR)
 
-if(LYX_INSTALL AND WIN32)
-	message(STATUS "Configuring NSIS files")
-	configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY)
-	configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY)
-	configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY)
-	message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer")
-endif()
+# The Win installer cannot be built by Cmake because one needs to install plugins for NSIS
+# see the Readme.txt of the installer
+#if(LYX_INSTALL AND WIN32)
+#	message(STATUS "Configuring NSIS files")
+#	configure_file(development/Win32/packaging/installer/lyx.nsi.cmake ${CMAKE_BINARY_DIR}/installer/lyx.nsi @ONLY)
+#	configure_file(development/Win32/packaging/installer/settings.nsh.cmake ${CMAKE_BINARY_DIR}/installer/settings-cmake.nsh @ONLY)
+#	configure_file(development/Win32/packaging/installer/include/declarations.nsh.cmake ${CMAKE_BINARY_DIR}/installer/declarations-cmake.nsh @ONLY)
+#	message(STATUS "NSIS files are created in ${CMAKE_BINARY_DIR}/installer")
+#endif()
 
 if(NOT GROUP_CODE)
 	#set(GROUP_CODE "The Golden Code")
@@ -795,7 +800,12 @@ else()
 endif()
 
 if(LYX_USE_STD_REGEX)
-  # Nothing to do
+  # Set only include path.
+  # Use internal boost, which is known to exist
+  # we don't need any libraries
+  set(Lyx_Boost_Libraries)
+  add_definitions(-DBOOST_USER_CONFIG=<config.h>)
+  include_directories(${TOP_SRC_DIR}/3rdparty/boost)
 else()
   # Using boost-regex
   if(LYX_EXTERNAL_BOOST)
@@ -1028,8 +1038,8 @@ if(LYX_INSTALL)
 		endif()
 		add_subdirectory(${LYX_CMAKE_DIR}/doc "${TOP_BINARY_DIR}/doc")
 	endif()
-	include(../Install)
 endif()
+include(../Install)
 
 add_subdirectory(src "${TOP_BINARY_DIR}/src")
 add_subdirectory(lib/lyx2lyx "${TOP_BINARY_DIR}/lyx2lyx")