diff options
| author | Oscar Fuentes <ofv@wanadoo.es> | 2009-06-04 09:26:16 +0000 |
|---|---|---|
| committer | Oscar Fuentes <ofv@wanadoo.es> | 2009-06-04 09:26:16 +0000 |
| commit | 208a87314b8610873f1cc183348a2226c04175f4 (patch) | |
| tree | 35a5571c09a0e7881e39b161ace8721c3b53f897 | |
| parent | 7ff7621a1d7abdafa510847ee6965196dc184ec1 (diff) | |
| download | bcm5719-llvm-208a87314b8610873f1cc183348a2226c04175f4.tar.gz bcm5719-llvm-208a87314b8610873f1cc183348a2226c04175f4.zip | |
CMake: Renamed LLVM_ENABLE_ASSERTS to
LLVM_ENABLE_ASSERTIONS. Fine-tuned the logic that controls the
definition of NDEBUG and _DEBUG macros.
Thanks to Jay Foad for this suggestions.
llvm-svn: 72864
| -rw-r--r-- | llvm/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | llvm/docs/CMake.html | 4 |
2 files changed, 15 insertions, 6 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index ba63484d8c0..a846eaeb2a4 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -58,13 +58,22 @@ endif( MSVC ) option(LLVM_ENABLE_THREADS "Use threads if available." ON) if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" ) - option(LLVM_ENABLE_ASSERTS "Enable asserts" OFF) + option(LLVM_ENABLE_ASSERTIONS "Enable assertions" OFF) else() - option(LLVM_ENABLE_ASSERTS "Enable asserts" ON) + option(LLVM_ENABLE_ASSERTIONS "Enable assertions" ON) endif() -if( LLVM_ENABLE_ASSERTS ) - add_definitions( -D_DEBUG -UNDEBUG ) +if( LLVM_ENABLE_ASSERTIONS ) + add_definitions( -D_DEBUG ) + # On Release builds cmake automatically defines NDEBUG, so we + # explicitly undefine it: + if( uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" ) + add_definitions( -UNDEBUG ) + endif() +else() + if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "RELEASE" ) + add_definitions( -DNDEBUG ) + endif() endif() if( LLVM_TARGETS_TO_BUILD STREQUAL "all" ) diff --git a/llvm/docs/CMake.html b/llvm/docs/CMake.html index b329ca46d62..ac3b57a8489 100644 --- a/llvm/docs/CMake.html +++ b/llvm/docs/CMake.html @@ -248,8 +248,8 @@ <dt><b>LLVM_ENABLE_THREADS</b>:BOOL</dt> <dd>Build with threads support, if available. Defaults to ON.</dd> - <dt><b>LLVM_ENABLE_ASSERTS</b>:BOOL</dt> - <dd>Enables code asserts. Defaults to ON if and only if + <dt><b>LLVM_ENABLE_ASSERTIONS</b>:BOOL</dt> + <dd>Enables code assertions. Defaults to ON if and only if CMAKE_BUILD_TYPE is <i>Release</i>.</dd> <dt><b>LLVM_ENABLE_PIC</b>:BOOL</dt> |
