UserGuide.lyx: accept and distribute today's changes

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7490545c1d201c567a7a39ae5645e09e77996d08..369728b6fd60e87ae8e0b79f64ceb19ffbb458cd 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,10 @@ cmake_minimum_required(VERSION 2.6.4)
 
 set(LYX_PROJECT LyX)
 
+# Instruct cmake to not use gnu extensions,
+# this prevents the mix of '-std=c++*' and '-std=gnu++*' flags
+set(CMAKE_CXX_EXTENSIONS OFF)
+
 enable_testing()
 
 get_filename_component(lyx_dir_readme ${CMAKE_SOURCE_DIR}/README REALPATH) # Resolve symlinks
@@ -593,11 +597,11 @@ if(NOT MSVC)
                set(LYX_CXX_FLAGS "${LYX_CXX_FLAGS} -D_GLIBCXX_DEBUG -D_GLIBCXX_DEBUG_PEDANTIC")
        endif()
        set(CMAKE_CXX_FLAGS       "${LYX_CXX_FLAGS} -fno-strict-aliasing " CACHE TYPE STRING FORCE)
-       set(CMAKE_CXX_FLAGS_DEBUG "${LYX_CXX_FLAGS} -fno-strict-aliasing -O0 -g3 -D_DEBUG" CACHE TYPE STRING FORCE)
+       set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g3 -D_DEBUG" CACHE TYPE STRING FORCE)
        if(MINGW)
-               set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O2 -DNDEBUG" CACHE TYPE STRING FORCE)
+               set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE TYPE STRING FORCE)
        else()
-               set(CMAKE_CXX_FLAGS_RELEASE "${LYX_CXX_FLAGS} -O3 -DNDEBUG" CACHE TYPE STRING FORCE)
+               set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE TYPE STRING FORCE)
        endif()
 endif()
 
@@ -790,37 +794,41 @@ else()
   add_subdirectory(3rdparty/zlib)
 endif()
 
-if(LYX_EXTERNAL_BOOST)
-       message(STATUS "Searching for boost")
-       if(NOT LYX_USE_STD_REGEX)
-               find_package(Boost COMPONENTS regex)
-       endif()
-       if(Boost_FOUND)
-               message(STATUS "Boost found")
-               message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
-               set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
-               if (LYX_STDLIB_DEBUG)
-                       # Comment from  Jean-Marc Lasgouttes:
-                       # In general, system boost libraries are incompatible with
-                       # the use of stdlib-debug in libstdc++. See ticket #9736 for
-                       # details.
-                       message(WARNING "Compiling LyX with stdlib-debug and system boost libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF' or using '-DLYX_EXTERNAL_BOOST=OFF'")
-               endif()
-       else()
-               message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
-       endif()
+if(LYX_USE_STD_REGEX)
+  # 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()
-       if(NOT LYX_USE_STD_REGEX)
-               set(Lyx_Boost_Libraries boost_regex)
-       endif()
-       add_definitions(-DBOOST_USER_CONFIG=<config.h>)
-       include_directories(${TOP_SRC_DIR}/3rdparty/boost)
-       add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
+  # Using boost-regex
+  if(LYX_EXTERNAL_BOOST)
+    message(STATUS "Searching for external boost")
+    find_package(Boost COMPONENTS regex)
+    if(Boost_FOUND)
+      message(STATUS "Boost found")
+      message(STATUS "Boost-libs = ${Boost_LIBRARIES}")
+      set(Lyx_Boost_Libraries ${Boost_LIBRARIES})
+      if (LYX_STDLIB_DEBUG)
+       # Comment from  Jean-Marc Lasgouttes:
+       # In general, system boost libraries are incompatible with
+       # the use of stdlib-debug in libstdc++. See ticket #9736 for
+       # details.
+       message(WARNING "Compiling LyX with stdlib-debug and system boost libraries may lead to crashes. Consider using '-DLYX_STDLIB_DEBUG=OFF' or using '-DLYX_EXTERNAL_BOOST=OFF'")
+      endif()
+    else()
+      message(FATAL_ERROR "Boost not found" ${Boost_ERROR_REASON})
+    endif()
+  else()
+    # Using included boost
+    set(Lyx_Boost_Libraries boost_regex)
+    add_definitions(-DBOOST_USER_CONFIG=<config.h>)
+    include_directories(${TOP_SRC_DIR}/3rdparty/boost)
+    add_subdirectory(3rdparty/boost "${TOP_BINARY_DIR}/3rdparty/boost")
+  endif()
 endif()
 
-
-
-
 if(WIN32)
        if(LYX_CONSOLE)
                set(LYX_QTMAIN_LIBRARY)
@@ -835,7 +843,7 @@ if(WIN32)
        else()
                # -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
                # does not use it and always declares the vista compatible API.
-               # If this ever changes then -DPSAPI_VERSION might be needed here as well. 
+               # If this ever changes then -DPSAPI_VERSION might be needed here as well.
                add_definitions(-DWINVER=0x0500)
        endif()
 endif()