[Lldb-commits] [lldb] r312666 - [CMake] Need to set WITH_LOCKDOWN on debugserver target

[Chris Bieneman via lldb-commits]

Author: cbieneman
Date: Wed Sep  6 13:15:43 2017
New Revision: 312666

URL: http://llvm.org/viewvc/llvm-project?rev=312666&view=rev
Log:
[CMake] Need to set WITH_LOCKDOWN on debugserver target

Turns out WITH_LOCKDOWN define changes the struct layout and constructor implementation for RNBSocket which is used in debugserver.cpp, so we need to make sure this is consistent.

In the future we should change WITH_LOCKDOWN to be configured in a generated header, but for now we can just set it correctly.

<rdar://problem/33900552>

Modified:
    lldb/trunk/tools/debugserver/source/CMakeLists.txt
    lldb/trunk/unittests/debugserver/CMakeLists.txt

Modified: lldb/trunk/tools/debugserver/source/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/tools/debugserver/source/CMakeLists.txt?rev=312666&r1=312665&r2=312666&view=diff
==============================================================================
--- lldb/trunk/tools/debugserver/source/CMakeLists.txt (original)
+++ lldb/trunk/tools/debugserver/source/CMakeLists.txt Wed Sep  6 13:15:43 2017
@@ -149,6 +149,11 @@ if(NOT SKIP_DEBUGSERVER)
       WITH_FBS
       WITH_BKS
       )
+    set_property(TARGET debugserver APPEND PROPERTY COMPILE_DEFINITIONS
+      WITH_LOCKDOWN
+      WITH_FBS
+      WITH_BKS
+      )
     set_property(TARGET lldbDebugserverCommon APPEND PROPERTY COMPILE_FLAGS
       -F${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks
       )

Modified: lldb/trunk/unittests/debugserver/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/unittests/debugserver/CMakeLists.txt?rev=312666&r1=312665&r2=312666&view=diff
==============================================================================
--- lldb/trunk/unittests/debugserver/CMakeLists.txt (original)
+++ lldb/trunk/unittests/debugserver/CMakeLists.txt Wed Sep  6 13:15:43 2017
@@ -17,3 +17,22 @@ add_lldb_unittest(debugserverTests
   LINK_COMPONENTS
     Support
   )
+
+if(IOS)
+  set_property(TARGET debugserverTests APPEND PROPERTY COMPILE_DEFINITIONS
+      WITH_LOCKDOWN
+      WITH_FBS
+      WITH_BKS
+      )
+  
+  add_lldb_unittest(debugserverNonUITests
+    RNBSocketTest.cpp
+    debugserver_LogCallback.cpp
+
+    LINK_LIBS
+      lldbDebugserverCommon_NonUI
+      lldbHost
+    LINK_COMPONENTS
+      Support
+    )
+endif()