Make trivstring class ready for use

[features.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 075a6a74e64973ff9e48e893de1f527bdb48ec5e..8be95c709ab153f1205fb2f2b97a5803dc1a38c2 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -259,10 +259,13 @@ if(UNIX OR MINGW)
                endif()
                set(LYX_GCC11_MODE "${CXX11_FLAG}")
        endif()
+       set(STD_STRING_USES_COW 1)
 else()
        if(MSVC10)
                set(LYX_USE_TR1 1)
                #set(LYX_USE_TR1_REGEX 1) #TODO should we use it in ECMAScript mode?
+       else()
+               set(STD_STRING_USES_COW 1)
        endif()
 endif()
 
@@ -316,7 +319,6 @@ endforeach(_c_l)
 
 FIND_PROGRAM(LYX_GITVERSION git)
 #message(STATUS "gitversion = ${LYX_GITVERSION}")
-set(LYX_GIT_COMMIT_HASH "none")
 set(LYX_REVISION_VERSION ${LYX_PATCH_VERSION})
 if(LYX_GITVERSION)
   if (LYX_LOCALVERSIONING)
@@ -332,13 +334,7 @@ if(LYX_GITVERSION)
       set(ENABLE_DIST ON)
     endif()
   endif()
-  EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} log -1 "--pretty=format:%H"
-    WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE lyxgitcommit OUTPUT_STRIP_TRAILING_WHITESPACE)
-  if (lyxgitcommit MATCHES "^[0-9a-f]+$")
-    set(LYX_GIT_COMMIT_HASH ${lyxgitcommit})
-  endif()
 endif()
-#message(STATUS "LYX_GIT_COMMIT_HASH = ${LYX_GIT_COMMIT_HASH}")
 
 # Set the programs (lyx, tex2lyx, etc.) suffix
 # When building an OS X bundle, we will append
@@ -481,7 +477,7 @@ endif()
 
 # lyx's source files
 set(LYX_CPP_FILES [a-zA-Z]*.cpp)
-set(LYX_HPP_FILES *.h)
+set(LYX_HPP_FILES [a-zA-Z]*.h)
 set(LYX_MOC_FILES moc_*.cpp)
 
 include(ProjectSourceGroup)
@@ -677,7 +673,7 @@ endif()
 # Compute qt4-version from ${QTVERSION}
 
 message(STATUS "")
-foreach(_v PACKAGE PACKAGE_VERSION LYX_GIT_COMMIT_HASH
+foreach(_v PACKAGE PACKAGE_VERSION
        PROGRAM_SUFFIX LYX_DATE LYX_DIR_VER LYX_USERDIR_VER
        LYX_ABS_TOP_SRCDIR
        LYX_ABS_INSTALLED_DATADIR LYX_ABS_INSTALLED_LOCALEDIR LYX_INSTALL_SUFFIX)