From 4976771e1178330334d2134eba55c64a37d56f0e Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Thu, 18 Jun 2020 14:04:01 -0400 Subject: [PATCH] [libc++] Add a dummy CMake file to include runtime subprojects Add a simple CMakeLists.txt to build the runtimes in lockstep without building all of LLVM. See [1] for details. [1]: http://lists.llvm.org/pipermail/llvm-dev/2020-June/142384.html --- libcxx/utils/ci/apple-install-libcxx.sh | 2 +- libcxx/utils/ci/runtimes/CMakeLists.txt | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 libcxx/utils/ci/runtimes/CMakeLists.txt diff --git a/libcxx/utils/ci/apple-install-libcxx.sh b/libcxx/utils/ci/apple-install-libcxx.sh index 94997ef..ae20bf3 100755 --- a/libcxx/utils/ci/apple-install-libcxx.sh +++ b/libcxx/utils/ci/apple-install-libcxx.sh @@ -114,7 +114,7 @@ for arch in ${architectures}; do step "Building libc++.dylib and libc++abi.dylib for architecture ${arch}" mkdir -p "${build_dir}/${arch}" (cd "${build_dir}/${arch}" && - xcrun --sdk "${sdk}" cmake "${llvm_root}/llvm" \ + xcrun --sdk "${sdk}" cmake "${llvm_root}/libcxx/utils/ci/runtimes" \ -GNinja \ -DCMAKE_MAKE_PROGRAM="$(xcrun --sdk "${sdk}" --find ninja)" \ -DLLVM_ENABLE_PROJECTS="libcxx;libcxxabi" \ diff --git a/libcxx/utils/ci/runtimes/CMakeLists.txt b/libcxx/utils/ci/runtimes/CMakeLists.txt new file mode 100644 index 0000000..43ebf9e --- /dev/null +++ b/libcxx/utils/ci/runtimes/CMakeLists.txt @@ -0,0 +1,26 @@ +cmake_minimum_required(VERSION 3.4.3) + +if(POLICY CMP0068) + cmake_policy(SET CMP0068 NEW) + set(CMAKE_BUILD_WITH_INSTALL_NAME_DIR ON) +endif() + +if(POLICY CMP0075) + cmake_policy(SET CMP0075 NEW) +endif() + +if(POLICY CMP0077) + cmake_policy(SET CMP0077 NEW) +endif() + +set(PACKAGE_VERSION "11.0.0git") + +project(LLVM_RUNTIMES) + +# Include individual projects +set(LLVM_ENABLE_PROJECTS "" CACHE STRING "Semicolon-separated list of runtimes to build.") + +set(LLVM_UMBRELLA_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../../..") +foreach(project IN LISTS LLVM_ENABLE_PROJECTS) + add_subdirectory("${LLVM_UMBRELLA_ROOT}/${project}" "${CMAKE_CURRENT_BINARY_DIR}/${project}") +endforeach() -- 2.7.4