[Lldb-commits] [lldb] r365648 - [CMake] Polish Apple-lldb caches

[Stefan Granitz via lldb-commits]

Author: stefan.graenitz
Date: Wed Jul 10 08:59:50 2019
New Revision: 365648

URL: http://llvm.org/viewvc/llvm-project?rev=365648&view=rev
Log:
[CMake] Polish Apple-lldb caches

Modified:
    lldb/trunk/cmake/caches/Apple-lldb-base.cmake
    lldb/trunk/cmake/caches/Apple-lldb-macOS.cmake

Modified: lldb/trunk/cmake/caches/Apple-lldb-base.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/caches/Apple-lldb-base.cmake?rev=365648&r1=365647&r2=365648&view=diff
==============================================================================
--- lldb/trunk/cmake/caches/Apple-lldb-base.cmake (original)
+++ lldb/trunk/cmake/caches/Apple-lldb-base.cmake Wed Jul 10 08:59:50 2019
@@ -7,9 +7,3 @@ set(LLVM_ENABLE_MODULES ON CACHE BOOL ""
 
 set(LIBCXX_ENABLE_SHARED OFF CACHE BOOL "")
 set(LIBCXX_ENABLE_STATIC OFF CACHE BOOL "")
-
-# Release builds set these explicitly:
-#set(LLDB_VERSION_MAJOR 9999 CACHE STRING "")
-#set(LLDB_VERSION_MINOR 9 CACHE STRING "")
-#set(LLDB_VERSION_PATCH 9 CACHE STRING "")
-#set(LLDB_VERSION_SUFFIX git CACHE STRING "")

Modified: lldb/trunk/cmake/caches/Apple-lldb-macOS.cmake
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/cmake/caches/Apple-lldb-macOS.cmake?rev=365648&r1=365647&r2=365648&view=diff
==============================================================================
--- lldb/trunk/cmake/caches/Apple-lldb-macOS.cmake (original)
+++ lldb/trunk/cmake/caches/Apple-lldb-macOS.cmake Wed Jul 10 08:59:50 2019
@@ -2,25 +2,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/Apple-
 
 set(LLDB_BUILD_FRAMEWORK ON CACHE BOOL "")
 set(LLDB_NO_INSTALL_DEFAULT_RPATH ON CACHE BOOL "")
+set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11 CACHE STRING "")
 
-# Set the install prefix to the default install location on the enduser machine.
-# If the location is not writeable on the build machine, specify another prefix
-# in the DESTDIR environment variable, e.g.: DESTDIR=/tmp ninja install
+# Default install location on the enduser machine. On the build machine, use the
+# DESTDIR environment variable in order to relocate the whole installation, e.g.:
+# `DESTDIR=/tmp ninja install-distribution`
 set(CMAKE_INSTALL_PREFIX /Applications/Xcode.app/Contents/Developer/usr CACHE STRING "")
 
-# Choose the install location for LLDB.framework so that it matches the
-# INSTALL_RPATH of the lldb driver. It's either absolute or relative to
-# CMAKE_INSTALL_PREFIX. In any case, DESTDIR will be an extra prefix.
+# Install location for LLDB.framework on the enduser machine.
+# DESTDIR will be an extra prefix.
 set(LLDB_FRAMEWORK_INSTALL_DIR /Applications/Xcode.app/Contents/SharedFrameworks CACHE STRING "")
 
-# DESTDIR will be an extra prefix
+# Install location for externalized debug-info on the build machine.
+# DESTDIR will be an extra prefix.
 set(LLDB_DEBUGINFO_INSTALL_PREFIX /debuginfo CACHE STRING "")
 
-# Release builds may change these:
-set(CMAKE_OSX_DEPLOYMENT_TARGET 10.11 CACHE STRING "")
-set(LLDB_USE_SYSTEM_DEBUGSERVER OFF CACHE BOOL "")
-set(LLVM_EXTERNALIZE_DEBUGINFO OFF CACHE BOOL "")
-
 set(LLVM_DISTRIBUTION_COMPONENTS
   lldb
   liblldb