switch ENABLE_ASSERTIONS macro with _DEBUG macro

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

diff --git a/development/cmake/CMakeLists.txt b/development/cmake/CMakeLists.txt
index 97dcb7421b2ad5a2a2a5b3bc48d1df6a3358573d..65edda58ab730076ca58d974ae34931505c19d9e 100644 (file)
--- 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 fb1e7d42989c39ecf301b1cc1bc26575ff370b36..62008f7bf1db40a1c7093782b40a6f53981dbb34 100644 (file)
--- 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