diff options
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | generator_plugin_dir.h.in | 4 | ||||
| -rw-r--r-- | generators/boostpython/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | generators/qtdoc/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | main.cpp | 4 |
5 files changed, 15 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 67b20a1b2..828798062 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,10 +15,16 @@ set(generator_MINOR_VERSION "3") set(generator_MICRO_VERSION "1") set(generator_VERSION "${generator_MAJOR_VERSION}.${generator_MINOR_VERSION}.${generator_MICRO_VERSION}") +set(generator_plugin_DIR ${LIB_INSTALL_DIR}/generatorrunner) + add_definitions(${QT_DEFINITIONS}) set(boostpythongenerator_VERSION ${generator_VERSION}) configure_file(boostpythongeneratorversion.h.in ${CMAKE_CURRENT_BINARY_DIR}/boostpythongeneratorversion.h @ONLY) + +# TODO Install it. +configure_file(generator_plugin_dir.h.in ${CMAKE_CURRENT_BINARY_DIR}/generator_plugin_dir.h @ONLY) + set(CMAKE_BUILD_TYPE Debug) include_directories(${CMAKE_CURRENT_SOURCE_DIR} diff --git a/generator_plugin_dir.h.in b/generator_plugin_dir.h.in new file mode 100644 index 000000000..8e914b363 --- /dev/null +++ b/generator_plugin_dir.h.in @@ -0,0 +1,4 @@ +#ifndef GENERATOR_PLUGIN_DIR_H +#define GENERATOR_PLUGIN_DIR_H +#define GENERATOR_PUGIN_DIR "@generator_plugin_DIR@" +#endif diff --git a/generators/boostpython/CMakeLists.txt b/generators/boostpython/CMakeLists.txt index 00e7915b5..f94d800be 100644 --- a/generators/boostpython/CMakeLists.txt +++ b/generators/boostpython/CMakeLists.txt @@ -14,6 +14,6 @@ target_link_libraries(boostpythongenerator ${QT_QTCORE_LIBRARY}) add_library(boostpython_generator SHARED ${boostpython_generator_SRC}) target_link_libraries(boostpython_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner) -install(TARGETS boostpython_generator DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS boostpython_generator DESTINATION ${generator_plugin_DIR}) install(TARGETS boostpythongenerator DESTINATION bin) diff --git a/generators/qtdoc/CMakeLists.txt b/generators/qtdoc/CMakeLists.txt index 804600e58..f943a7cfd 100644 --- a/generators/qtdoc/CMakeLists.txt +++ b/generators/qtdoc/CMakeLists.txt @@ -10,6 +10,6 @@ target_link_libraries(docgenerator ${QT_QTCORE_LIBRARY}) add_library(qtdoc_generator SHARED ${qtdoc_generator_SRC}) target_link_libraries(qtdoc_generator ${APIEXTRACTOR_LIBRARY} ${QT_QTCORE_LIBRARY} genrunner) -install(TARGETS qtdoc_generator DESTINATION ${LIB_INSTALL_DIR}) +install(TARGETS qtdoc_generator DESTINATION ${generator_plugin_DIR}) install(TARGETS docgenerator DESTINATION bin) @@ -27,6 +27,7 @@ #include <iostream> #include <apiextractor/apiextractor.h> #include "boostpythongeneratorversion.h" +#include "generator_plugin_dir.h" #include "generator.h" #if defined(Q_OS_WIN32) @@ -120,7 +121,8 @@ int main(int argc, char *argv[]) // Try to load a generator QString generatorSet = args.value("generatorSet"); if (!generatorSet.isEmpty()) { - QLibrary plugin(generatorSet+"_generator"); + QString generatorFile = QString(GENERATOR_PUGIN_DIR) + "/lib" + generatorSet + "_generator"; + QLibrary plugin(generatorFile); getGeneratorsFunc getGenerators = reinterpret_cast<getGeneratorsFunc>(plugin.resolve("getGenerators")); if (getGenerators) generators = getGenerators(); |