ApiExtractor merged into Shiboken as a static library.

2 files changed, 13 insertions, 3 deletions

diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt
index 37a6f3cc9..d18958c27 100644
--- a/generator/CMakeLists.txt
+++ b/generator/CMakeLists.txt
@@ -7,23 +7,28 @@ shiboken/headergenerator.cpp
 shiboken/overloaddata.cpp
 shiboken/shibokengenerator.cpp
 shiboken/shibokennormalize.cpp
-qtdoc/qtdocgenerator.cpp
 main.cpp
 )
 
+if (NOT DISABLE_DOCSTRINGS)
+    set(shiboken_SRC ${shiboken_SRC} qtdoc/qtdocgenerator.cpp)
+    add_definitions(-DDOCSTRINGS_ENABLED)
+endif()
+
 include_directories(${CMAKE_CURRENT_SOURCE_DIR}/shiboken
                     ${CMAKE_CURRENT_SOURCE_DIR}/qtdoc
                     ${CMAKE_CURRENT_SOURCE_DIR}
                     ${CMAKE_CURRENT_BINARY_DIR}
-                    ${APIEXTRACTOR_INCLUDE_DIR}
+                    ${apiextractor_SOURCE_DIR}
                     ${QT_INCLUDE_DIR}
                     ${QT_QTCORE_INCLUDE_DIR}
                     ${QT_QTXML_INCLUDE_DIR})
 
 add_executable(shiboken ${shiboken_SRC})
+add_dependencies(shiboken apiextractor)
 set_target_properties(shiboken PROPERTIES OUTPUT_NAME shiboken${shiboken_SUFFIX})
 target_link_libraries(shiboken
-                      ${APIEXTRACTOR_LIBRARY}
+                      apiextractor
                       ${QT_QTCORE_LIBRARY}
                       ${QT_QTXML_LIBRARY})
 
diff --git a/generator/main.cpp b/generator/main.cpp
index f9f94f7ac..9ed9aec41 100644
--- a/generator/main.cpp
+++ b/generator/main.cpp
@@ -309,7 +309,12 @@ int main(int argc, char *argv[])
 
     // Pre-defined generator sets.
     if (generatorSet == "qtdoc") {
+#ifndef DOCSTRINGS_ENABLED
+        errorPrint("shiboken: Doc strings extractions was not enabled in this shiboken build.");
+        return EXIT_FAILURE;
+#else
         generators << new QtDocGenerator;
+#endif
     } else if (generatorSet.isEmpty() || generatorSet == "shiboken") {
         generators << new CppGenerator << new HeaderGenerator;
     } else {