]> git.lyx.org Git - features.git/commitdiff
TR1: enable 4.4.0 and mingw
authorPeter Kümmel <syntheticpp@gmx.net>
Wed, 30 Jun 2010 14:30:10 +0000 (14:30 +0000)
committerPeter Kümmel <syntheticpp@gmx.net>
Wed, 30 Jun 2010 14:30:10 +0000 (14:30 +0000)
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34733 a592a061-630c-0410-9148-cb99ea01b6c8

development/cmake/CMakeLists.txt

index 62f510a90cc0c04363826920d66055e8c95a6ace..37e7a90d501ff10d6056612df69c1ff9911babb1 100644 (file)
@@ -27,9 +27,10 @@ set(LIBRARY_OUTPUT_PATH  ${CMAKE_BINARY_DIR}/lib)
 option(lyxinstall "Build install projects/rules" ON)
 
 
-if(UNIX)
+if(UNIX OR MINGW)
     execute_process(COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION)
-    if(GCC_VERSION VERSION_GREATER 4.4)
+    message(STATUS "Using GCC version ${GCC_VERSION}")
+    if(NOT GCC_VERSION VERSION_LESS 4.4)
         set(LYX_USE_TR1 1)
         # GCC <= 4.5 does not support regex: there are linker errors
         # http://gcc.gnu.org/onlinedocs/libstdc++/manual/status.html#status.iso.tr1
@@ -101,6 +102,7 @@ else()
   set(PROGRAM_SUFFIX "")
 endif()
 
+
 if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
   # see http://www.cmake.org/pipermail/cmake/2006-October/011559.html
   if (UNIX)