diff options
| author | Dan Liew <dan@su-root.co.uk> | 2015-08-21 18:10:57 +0000 |
|---|---|---|
| committer | Dan Liew <dan@su-root.co.uk> | 2015-08-21 18:10:57 +0000 |
| commit | 1e3dc527ea6d548bd776896d6fe73a91754d762e (patch) | |
| tree | 9f4ec6c0acef18f0ccfd76e799653a1251380262 /llvm/cmake | |
| parent | ef1fa56c83567263a801a04f9a822f761fb0a6a2 (diff) | |
| download | bcm5719-llvm-1e3dc527ea6d548bd776896d6fe73a91754d762e.tar.gz bcm5719-llvm-1e3dc527ea6d548bd776896d6fe73a91754d762e.zip | |
Filter libraries that are not installed out of CMake exports (currently
gtest and gtest_main) when generating ``Makefile.llvmbuild``.
Libraries that are not installed should not be exported because they
won't be available from an install tree. Rather than filtering out the
gtest libraries in cmake/modules/Makefile, simply teach llvm-build to
filter out libraries that will not be installed from its generated list
of exported libraries.
Note that LLVMBUILD_LIB_DEPS_* are used during our own CMake build
process so we cannot filter LLVMBUILD_LIB_DEPS_gtest* out in llvm-build.
We must leave this gtest filter logic in cmake/modules/Makefile.
llvm-svn: 245718
Diffstat (limited to 'llvm/cmake')
| -rw-r--r-- | llvm/cmake/modules/Makefile | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/llvm/cmake/modules/Makefile b/llvm/cmake/modules/Makefile index fb375b1ead5..abfda93b210 100644 --- a/llvm/cmake/modules/Makefile +++ b/llvm/cmake/modules/Makefile @@ -37,10 +37,6 @@ else LLVM_ENABLE_RTTI := 0 endif -# Strip out gtest and gtest_main from LLVM_LIBS_TO_EXPORT, these are not -# installed and won't be available from the install tree. -LLVM_LIBS_TO_EXPORT := $(filter-out gtest gtest_main,$(LLVM_LIBS_TO_EXPORT)) - ifndef LLVM_LIBS_TO_EXPORT $(error LLVM_LIBS_TO_EXPORT cannot be empty) endif @@ -122,7 +118,7 @@ $(PROJ_OBJ_DIR)/LLVMExports.cmake: $(LLVMBuildCMakeExportsFrag) Makefile done && \ cat "$(LLVMBuildCMakeExportsFrag)" && \ echo 'set_property(TARGET LLVMSupport APPEND PROPERTY IMPORTED_LINK_INTERFACE_LIBRARIES '"$(subst -l,,$(LIBS))"')' \ - ) | grep -v gtest > $@ + ) > $@ all-local:: $(addprefix $(PROJ_OBJ_DIR)/, $(OBJMODS)) |
