[llvm-branch-commits] [libcxxabi] 5e7a93a - [libc++] Set CMAKE_FOLDER. NFC.
Marek Kurdej via llvm-branch-commits
llvm-branch-commits at lists.llvm.org
Mon Jan 25 00:57:33 PST 2021
Author: Marek Kurdej
Date: 2021-01-25T09:51:16+01:00
New Revision: 5e7a93a954e68b002edd2cd7fb1b2a61186c7124
URL: https://github.com/llvm/llvm-project/commit/5e7a93a954e68b002edd2cd7fb1b2a61186c7124
DIFF: https://github.com/llvm/llvm-project/commit/5e7a93a954e68b002edd2cd7fb1b2a61186c7124.diff
LOG: [libc++] Set CMAKE_FOLDER. NFC.
* This variable populates the default value of FOLDER target property. It is used in some IDE's (e.g. MSVC) to group different targets together.
Added:
Modified:
libcxx/CMakeLists.txt
libcxx/benchmarks/CMakeLists.txt
libcxxabi/CMakeLists.txt
Removed:
################################################################################
diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt
index 6a55245ab87a..4e7e8f978546 100644
--- a/libcxx/CMakeLists.txt
+++ b/libcxx/CMakeLists.txt
@@ -19,6 +19,8 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
+set(CMAKE_FOLDER "libc++")
+
set(LIBCXX_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LIBCXX_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(LIBCXX_BINARY_INCLUDE_DIR "${LIBCXX_BINARY_DIR}/include/c++build")
diff --git a/libcxx/benchmarks/CMakeLists.txt b/libcxx/benchmarks/CMakeLists.txt
index 42d25c20c811..0327f05ccfa6 100644
--- a/libcxx/benchmarks/CMakeLists.txt
+++ b/libcxx/benchmarks/CMakeLists.txt
@@ -5,6 +5,8 @@ include(CheckCXXCompilerFlag)
# Build Google Benchmark for libc++
#==============================================================================
+set(CMAKE_FOLDER "${CMAKE_FOLDER}/Benchmarks")
+
set(BENCHMARK_LIBCXX_COMPILE_FLAGS
-Wno-unused-command-line-argument
-nostdinc++
diff --git a/libcxxabi/CMakeLists.txt b/libcxxabi/CMakeLists.txt
index ede8bd71da4c..b803347c2a8e 100644
--- a/libcxxabi/CMakeLists.txt
+++ b/libcxxabi/CMakeLists.txt
@@ -17,6 +17,8 @@ set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH}
)
+set(CMAKE_FOLDER "libc++")
+
set(LIBCXXABI_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(LIBCXXABI_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
set(LIBCXXABI_LIBCXX_PATH "${CMAKE_CURRENT_LIST_DIR}/../libcxx" CACHE PATH
More information about the llvm-branch-commits
mailing list