From 3459b8d89d64f076e737c690112333436ea04058 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Peter=20K=C3=BCmmel?= Date: Fri, 20 Oct 2006 10:38:33 +0000 Subject: [PATCH] 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 --- development/cmake/CMakeLists.txt | 5 +++++ development/cmake/config.h.cmake | 3 +++ development/cmake/src/mathed/CMakeLists.txt | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index b51d1f8f49..5764539694 100644 --- 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 4a2db7bd51..d45c48d29c 100644 --- 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 da43096287..50735f99a3 100644 --- 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) -- 2.39.2