From daaf9f1379539baaeb9e6a6c1a62031d7a0ddf6c Mon Sep 17 00:00:00 2001 From: Michael Gottesman Date: Sun, 10 Jul 2016 02:43:50 +0000 Subject: [PATCH] [cmake] Change lli-child-target to use add_llvm_utility instead of add_llvm_executable. We are currently using add_llvm_utility for executable targets that: 1. Are built by default. 2. Used for testing. 3. Are not installed by default. Originally, lli-child-target used add_llvm_tool instead of add_llvm_executable directly. This was changed so that lli-child-target would not be installed. This was good since this is only used for testing and should never be installed for users. This also had the unfortunate side effect that one can never turn off the building of lli-child-target by default, a regression for projects that by default do not want to compile any LLVM tools beyond tablegen/llvm-config. This patch changes lli-child-target to use add_llvm_utility. This makes sense since: 1. lli-child-target matches the semantics of executables created with add_llvm_utility. 2. We fix the regression since now one can use the flag LLVM_BUILD_UTILS to eliminate default compilation. llvm-svn: 275008 --- llvm/tools/lli/CMakeLists.txt | 4 +++- llvm/tools/lli/ChildTarget/CMakeLists.txt | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/llvm/tools/lli/CMakeLists.txt b/llvm/tools/lli/CMakeLists.txt index e317db6..2bdd066 100644 --- a/llvm/tools/lli/CMakeLists.txt +++ b/llvm/tools/lli/CMakeLists.txt @@ -1,4 +1,6 @@ -add_subdirectory(ChildTarget) +if ( LLVM_INCLUDE_UTILS ) + add_subdirectory(ChildTarget) +endif() set(LLVM_LINK_COMPONENTS CodeGen diff --git a/llvm/tools/lli/ChildTarget/CMakeLists.txt b/llvm/tools/lli/ChildTarget/CMakeLists.txt index 0f851d5..e4fe0c7 100644 --- a/llvm/tools/lli/ChildTarget/CMakeLists.txt +++ b/llvm/tools/lli/ChildTarget/CMakeLists.txt @@ -4,8 +4,7 @@ set(LLVM_LINK_COMPONENTS Support ) -add_llvm_executable(lli-child-target +add_llvm_utility(lli-child-target ChildTarget.cpp ) -set_target_properties(lli-child-target PROPERTIES FOLDER "Misc") -- 2.7.4