CMake: allow compile-time C++ flags to be set

[lyx.git] / CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ccb4a6c357ed7803d39dfa9a762153f20910cf7b..fa16d1074d90ea89b0ba327a0d32c5d82dff5e29 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -279,7 +279,8 @@ if (LYX_LOCALVERSIONING)
        FIND_PROGRAM(LYX_GITVERSION git)
        #message(STATUS "gitversion = ${LYX_GITVERSION}")
        if(LYX_GITVERSION)
-               EXECUTE_PROCESS(COMMAND ${LYX_GITVERSION} "describe" WORKING_DIRECTORY "${TOP_SRC_DIR}" OUTPUT_VARIABLE LYX_PACKAGE_RELEASE OUTPUT_STRIP_TRAILING_WHITESPACE)
+               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]+\)\\-.*$")
                  # We will add offset of 40000 to get appropriate value to
                  # previous svn.
@@ -445,7 +446,7 @@ endif()
 if(LYX_SHARED_LIBRARIES)
        set(library_type SHARED)
 else()
-       set(library_type STATIC)
+       set(library_type STATIC)
 endif()
 
 if(NOT MSVC)
@@ -468,6 +469,14 @@ if(NOT MSVC)
        endif()
 endif()
 
+set(LYX_CXX_FLAGS_EXTRA "" CACHE STRING "Desired semicolon separated list of extra cxx compile flags, like '-Werror'")
+mark_as_advanced(LYX_CXX_FLAGS_EXTRA)
+if(LYX_CXX_FLAGS_EXTRA)
+       foreach(_flag ${LYX_CXX_FLAGS_EXTRA})
+               add_definitions(${_flag})
+       endforeach()
+endif()
+
 find_package(Qt5Core QUIET)
 if (Qt5Core_FOUND)
        find_package(Qt5Widgets REQUIRED)