This revision was automatically updated to reflect the committed changes.
Closed by commit rL314929: LLDB cmake fix: define LLDB_CONFIGURATION_xxx based
on the build type (authored by lemo).
Changed prior to commit:
https://reviews.llvm.org/D38552?vs=117704=117730#toc
Repository:
rL LLVM
Identical, no - note the checks are inverted. Definitely uglier, but it's
defaulting to LLDB_CONFIGURATION_DEBUG if CMAKE_BUILD_TYPE is not defined,
right?
With the current defaulting rule I pointed out both versions should be
equivalent. If anything I prefer the 1st version since I like to avoid
zturner added inline comments.
Comment at: CMakeLists.txt:15
+# Define the LLDB_CONFIGURATION_xxx matching the build type
+if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
+ add_definitions( -DLLDB_CONFIGURATION_RELEASE )
Isn't this identical to the code
lemo updated this revision to Diff 117704.
lemo added a comment.
Changed how CMAKE_BUILD_TYPE is tested to ensure we default to
LLDB_CONFIGURATION_DEBUG.
https://reviews.llvm.org/D38552
Files:
CMakeLists.txt
include/lldb/Utility/SharingPtr.h
Index: include/lldb/Utility/SharingPtr.h
lemo added a comment.
Good point, I wouldn't be surprised if that was the case at some point, but
right now the main llvm CMakeLists.txt has this:
...
if (NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
message(STATUS "No build type selected, default to Debug")
set(CMAKE_BUILD_TYPE
zturner added inline comments.
Comment at: CMakeLists.txt:15
+# Define the LLDB_CONFIGURATION_xxx matching the build type
+if( uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
+ add_definitions( -DLLDB_CONFIGURATION_DEBUG )
I'm pretty sure that if you run CMake
lemo created this revision.
Herald added a subscriber: mgorny.
Neither LLDB_CONFIGURATION_DEBUG nor LLDB_CONFIGURATION_RELEASE were ever set
in the CMake LLDB project.
Also cleaned up a questionable #ifdef in SharingPtr.h, removing all the
references to LLDB_CONFIGURATION_BUILD_AND_INTEGRATION