From a932a994f01646773ba688d6810b1456bbc18236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Thu, 26 Oct 2006 17:11:34 +0000 Subject: [PATCH] switch ENABLE_ASSERTIONS macro with _DEBUG macro git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@15567 a592a061-630c-0410-9148-cb99ea01b6c8 --- development/cmake/CMakeLists.txt | 5 ----- development/cmake/config.h.cmake | 5 +++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt index 97dcb7421b..65edda58ab 100644 --- a/development/cmake/CMakeLists.txt +++ b/development/cmake/CMakeLists.txt @@ -15,11 +15,6 @@ 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 fb1e7d4298..62008f7bf1 100644 --- a/development/cmake/config.h.cmake +++ b/development/cmake/config.h.cmake @@ -136,8 +136,9 @@ #endif - -#cmakedefine ENABLE_ASSERTIONS 1 +#ifdef _DEBUG +# define ENABLE_ASSERTIONS 1 +#endif #if !defined(ENABLE_ASSERTIONS) # define BOOST_DISABLE_ASSERTS 1