cmake files:

- mathed: remove InsetMathMox.C fro the build process
- config: enable assertions by default

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15396 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index b51d1f8f498e0c73ea639045c74380931d23009d..57645396949973869fd5ce63ee85846a1f3fb728 100644 (file)
--- a/development/cmake/CMakeLists.txt
+++ b/development/cmake/CMakeLists.txt
@@ -15,6 +15,11 @@ set(LYX_DATE "not released yet")
 #TODO
 set(VERSION_INFO "CMake Build")
 
+#TODO: add command line option
+#      enable by default because the cmake 
+#      build is mostly used for development
+set(ENABLE_ASSERTIONS 1)
+
 if(WIN32)
        set(USE_WINDOWS_PACKAGING 1)
 else(WIN32)

diff --git a/development/cmake/config.h.cmake b/development/cmake/config.h.cmake
index 4a2db7bd513208b4c2916010ec9b569808bcb812..d45c48d29c4fc3a17aa7c80e4c83e03458c6732e 100644 (file)
--- a/development/cmake/config.h.cmake
+++ b/development/cmake/config.h.cmake
@@ -136,6 +136,9 @@
 #endif
 
 
+
+#cmakedefine ENABLE_ASSERTIONS 1
+
 #if !defined(ENABLE_ASSERTIONS)
 #  define BOOST_DISABLE_ASSERTS 1
 #endif

diff --git a/development/cmake/src/mathed/CMakeLists.txt b/development/cmake/src/mathed/CMakeLists.txt
index da43096287de2e4760958ec3d26aa6e4ef4dbba7..50735f99a3127df5cc5269ecde40f236f26d49c4 100644 (file)
--- a/development/cmake/src/mathed/CMakeLists.txt
+++ b/development/cmake/src/mathed/CMakeLists.txt
@@ -11,7 +11,7 @@ file(GLOB mathed_headers ${TOP_SRC_DIR}/src/mathed/*.h)
 
 list(REMOVE_ITEM mathed_sources
        ${TOP_SRC_DIR}/src/mathed/InsetMathXYArrow.C
-       ${TOP_SRC_DIR}/src/mathed/InsetMathMbox.C
+       ${TOP_SRC_DIR}/src/mathed/InsetMathMBox.C
        ${TOP_SRC_DIR}/src/mathed/InsetFormulaMacro.C)
 
 include_directories(${TOP_SRC_DIR}/src/mathed)