From b811be1ce4aa832ed7aa8542da535000924effa3 Mon Sep 17 00:00:00 2001
From: Lauro Neto <lauro.neto@openbossa.org>
Date: Thu, 3 Sep 2009 10:38:55 -0300
Subject: Installs generator plugins in its own directory.

---
 CMakeLists.txt                        | 6 ++++++
 generator_plugin_dir.h.in             | 4 ++++
 generators/boostpython/CMakeLists.txt | 2 +-
 generators/qtdoc/CMakeLists.txt       | 2 +-
 main.cpp                              | 4 +++-
 5 files changed, 15 insertions(+), 3 deletions(-)
 create mode 100644 generator_plugin_dir.h.in

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)
 
diff --git a/main.cpp b/main.cpp
index 1f6f76adc..c9bbfbd37 100644
--- a/main.cpp
+++ b/main.cpp
@@ -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();
-- 
cgit v1.2.3