1 files changed, 19 insertions, 26 deletions
diff --git a/sources/shiboken2/ApiExtractor/CMakeLists.txt b/sources/shiboken2/ApiExtractor/CMakeLists.txt
index 26ae03173..f2af51c02 100644
--- a/sources/shiboken2/ApiExtractor/CMakeLists.txt
+++ b/sources/shiboken2/ApiExtractor/CMakeLists.txt
@@ -27,11 +27,17 @@ add_definitions(-DQT_PLUGIN)
 add_definitions(-DQT_SHARED)
 add_definitions(-DRXX_ALLOCATOR_INIT_0)
 
+# Pass the path to the clang includes dir, so it headers like stdarg.h.
+if(UNIX AND NOT APPLE)
+    add_definitions(-DCLANG_BUILTIN_INCLUDES_DIR="${CLANG_BUILTIN_INCLUDES_DIR}")
+else()
+    add_definitions(-DCLANG_BUILTIN_INCLUDES_DIR="")
+endif()
+
 set(apiextractor_SRC
 apiextractor.cpp
 abstractmetabuilder.cpp
 abstractmetalang.cpp
-asttoxml.cpp
 fileout.cpp
 graph.cpp
 reporthandler.cpp
@@ -39,28 +45,19 @@ typeparser.cpp
 typesystem.cpp
 include.cpp
 typedatabase.cpp
-parser/ast.cpp
-parser/binder.cpp
-parser/class_compiler.cpp
+# Clang
+clangparser/compilersupport.cpp
+clangparser/clangparser.cpp
+clangparser/clangbuilder.cpp
+clangparser/clangdebugutils.cpp
+clangparser/clangutils.cpp
+# Old parser
 parser/codemodel.cpp
-parser/codemodel_finder.cpp
-parser/compiler_utils.cpp
-parser/control.cpp
-parser/declarator_compiler.cpp
-parser/default_visitor.cpp
-parser/dumptree.cpp
-parser/lexer.cpp
-parser/list.cpp
-parser/name_compiler.cpp
-parser/parser.cpp
-parser/smallobject.cpp
-parser/tokens.cpp
-parser/type_compiler.cpp
-parser/visitor.cpp
-parser/rpp/builtin-macros.cpp
-parser/rpp/preprocessor.cpp
 )
 
+set(APIEXTRACTOR_EXTRA_INCLUDES ${CLANG_EXTRA_INCLUDES})
+set(APIEXTRACTOR_EXTRA_LIBRARIES ${CLANG_EXTRA_LIBRARIES})
+
 if (NOT DISABLE_DOCSTRINGS)
     set(apiextractor_SRC
         ${apiextractor_SRC}
@@ -68,16 +65,12 @@ if (NOT DISABLE_DOCSTRINGS)
         doxygenparser.cpp
         qtdocparser.cpp
     )
-    set(APIEXTRACTOR_EXTRA_INCLUDES ${LIBXSLT_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
-    set(APIEXTRACTOR_EXTRA_LIBRARIES ${LIBXSLT_LIBRARIES} ${LIBXML2_LIBRARIES})
-else()
-    set(APIEXTRACTOR_EXTRA_INCLUDES "")
-    set(APIEXTRACTOR_EXTRA_LIBRARIES "")
+    set(APIEXTRACTOR_EXTRA_INCLUDES ${APIEXTRACTOR_EXTRA_INCLUDES} ${LIBXSLT_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
+    set(APIEXTRACTOR_EXTRA_LIBRARIES ${APIEXTRACTOR_EXTRA_LIBRARIES} ${LIBXSLT_LIBRARIES} ${LIBXML2_LIBRARIES})
 endif()
 
 set(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib${LIB_SUFFIX})" FORCE)
 
-qt5_add_resources(apiextractor_RCCS_SRC generator.qrc)
 set(CMAKE_AUTOMOC ON)
 
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}