Skip to content
This repository was archived by the owner on Nov 1, 2021. It is now read-only.

Commit ae9459c

Browse files
committed
[CMake] Move CLANG_ENABLE_(ARCMT|OBJC_REWRITER|STATIC_ANALYZER) into clang/Config/config.h.
LLVM_ENABLE_MODULES is sensitive of -D. Move them into config.h. FIXME: It'd be better that they are #cmakedefine01 rather than #cmakedefine. (#if FOO rather than #if defined(FOO)) Then we can find missing #include "clang/Config/config.h" in the future. Differential Revision: https://reviews.llvm.org/D35527 git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@308277 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 906b61f commit ae9459c

File tree

7 files changed

+11
-5
lines changed

7 files changed

+11
-5
lines changed

CMakeLists.txt

+1-5
Original file line numberDiff line numberDiff line change
@@ -389,11 +389,7 @@ if(CLANG_ANALYZER_BUILD_Z3)
389389
endif()
390390

391391
if(CLANG_ENABLE_ARCMT)
392-
add_definitions(-DCLANG_ENABLE_ARCMT)
393-
add_definitions(-DCLANG_ENABLE_OBJC_REWRITER)
394-
endif()
395-
if(CLANG_ENABLE_STATIC_ANALYZER)
396-
add_definitions(-DCLANG_ENABLE_STATIC_ANALYZER)
392+
set(CLANG_ENABLE_OBJC_REWRITER ON)
397393
endif()
398394

399395
# Clang version information

include/clang/Config/config.h.cmake

+5
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,9 @@
5656
/* enable x86 relax relocations by default */
5757
#cmakedefine01 ENABLE_X86_RELAX_RELOCATIONS
5858

59+
/* Enable each functionality of modules */
60+
#cmakedefine CLANG_ENABLE_ARCMT
61+
#cmakedefine CLANG_ENABLE_OBJC_REWRITER
62+
#cmakedefine CLANG_ENABLE_STATIC_ANALYZER
63+
5964
#endif

lib/Frontend/Rewrite/FrontendActions.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
#include "clang/Rewrite/Frontend/FrontendActions.h"
1111
#include "clang/AST/ASTConsumer.h"
1212
#include "clang/Basic/CharInfo.h"
13+
#include "clang/Config/config.h"
1314
#include "clang/Frontend/CompilerInstance.h"
1415
#include "clang/Frontend/FrontendActions.h"
1516
#include "clang/Frontend/FrontendDiagnostic.h"

lib/Frontend/Rewrite/RewriteModernObjC.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include "clang/Basic/IdentifierTable.h"
2222
#include "clang/Basic/SourceManager.h"
2323
#include "clang/Basic/TargetInfo.h"
24+
#include "clang/Config/config.h"
2425
#include "clang/Lex/Lexer.h"
2526
#include "clang/Rewrite/Core/Rewriter.h"
2627
#include "llvm/ADT/DenseSet.h"

lib/Frontend/Rewrite/RewriteObjC.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#include "clang/Basic/Diagnostic.h"
2121
#include "clang/Basic/IdentifierTable.h"
2222
#include "clang/Basic/SourceManager.h"
23+
#include "clang/Config/config.h"
2324
#include "clang/Lex/Lexer.h"
2425
#include "clang/Rewrite/Core/Rewriter.h"
2526
#include "llvm/ADT/DenseSet.h"

lib/FrontendTool/ExecuteCompilerInvocation.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "clang/FrontendTool/Utils.h"
1616
#include "clang/ARCMigrate/ARCMTActions.h"
1717
#include "clang/CodeGen/CodeGenAction.h"
18+
#include "clang/Config/config.h"
1819
#include "clang/Driver/Options.h"
1920
#include "clang/Frontend/CompilerInstance.h"
2021
#include "clang/Frontend/CompilerInvocation.h"

tools/libclang/ARCMigrate.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "clang-c/Index.h"
1515
#include "CXString.h"
1616
#include "clang/ARCMigrate/ARCMT.h"
17+
#include "clang/Config/config.h"
1718
#include "clang/Frontend/TextDiagnosticBuffer.h"
1819
#include "llvm/Support/FileSystem.h"
1920

0 commit comments

Comments
 (0)