Use CTK_PLUGIN_DIR from ctkConfig.h instead of hard-coded dirs.

Applications/ctkExampleHost/ctkExampleHostMain.cpp

@@ -32,6 +32,7 @@
 #include <QUrl>
 
 // CTKPluginFramework includes
+#include <ctkConfig.h>
 #include <ctkPluginFrameworkFactory.h>
 #include <ctkPluginFramework.h>
 #include <ctkPluginException.h>
@@ -67,9 +68,9 @@ int main(int argv, char** argc)
     }
 
 #ifdef CMAKE_INTDIR
-  QString pluginPath = qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
+  QString pluginPath = CTK_PLUGIN_DIR CMAKE_INTDIR "/";
 #else
-  QString pluginPath = qApp->applicationDirPath() + "/plugins/";
+  QString pluginPath = CTK_PLUGIN_DIR;
 #endif
 
   qApp->addLibraryPath(pluginPath);

Applications/ctkExampleHostedApp/ctkExampleHostedAppMain.cpp

@@ -30,6 +30,7 @@
 #include <QDebug>
 
 // CTK includes
+#include <ctkConfig.h>
 #include <ctkCommandLineParser.h>
 #include <ctkPluginFrameworkFactory.h>
 #include <ctkPluginFramework.h>
@@ -110,9 +111,9 @@ int main(int argv, char** argc)
     }
 
 #ifdef CMAKE_INTDIR
-  QString pluginPath = qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
+  QString pluginPath = CTK_PLUGIN_DIR CMAKE_INTDIR "/";
 #else
-  QString pluginPath = qApp->applicationDirPath() + "/plugins/";
+  QString pluginPath = CTK_PLUGIN_DIR;
 #endif
 
   qApp->addLibraryPath(pluginPath);

Applications/ctkPluginBrowser/ctkPluginBrowser.cpp

@@ -30,6 +30,7 @@
 
 #include <ui_ctkPluginBrowserMainWindow.h>
 
+#include <ctkConfig.h>
 #include <ctkPluginException.h>
 #include <ctkPluginFramework.h>
 #include <ctkPluginContext.h>
@@ -65,9 +66,9 @@ ctkPluginBrowser::ctkPluginBrowser(ctkPluginFramework* framework)
 
   QStringList pluginDirs;
 #ifdef CMAKE_INTDIR
-  pluginDirs << qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
+  pluginDirs << CTK_PLUGIN_DIR CMAKE_INTDIR "/";
 #else
-  pluginDirs << qApp->applicationDirPath() + "/plugins/";
+  pluginDirs << CTK_PLUGIN_DIR;
 #endif
 
   QStringListIterator dirIt(pluginDirs);

Applications/ctkPluginGenerator/ctkPluginGeneratorMain.cpp

@@ -19,6 +19,7 @@
 
 =============================================================================*/
 
+#include <ctkConfig.h>
 #include <ctkPluginFrameworkFactory.h>
 #include <ctkPluginFramework.h>
 #include <ctkPluginException.h>
@@ -73,9 +74,9 @@ int main(int argv, char** argc)
   }
 
 #ifdef CMAKE_INTDIR
-  QString pluginPath = qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
+  QString pluginPath = CTK_PLUGIN_DIR CMAKE_INTDIR "/";
 #else
-  QString pluginPath = qApp->applicationDirPath() + "/plugins/";
+  QString pluginPath = CTK_PLUGIN_DIR;
 #endif
 
   qApp->addLibraryPath(pluginPath);

CMake/ctkFunctionGetIncludeDirs.cmake

@@ -26,7 +26,7 @@ FUNCTION(ctkFunctionGetIncludeDirs var_include_dirs)
     MESSAGE(FATAL_ERROR "No targets given")
   ENDIF()
 
-  SET(_include_dirs ${${var_include_dirs}})
+  SET(_include_dirs ${${var_include_dirs}} ${CTK_CONFIG_H_INCLUDE_DIR})
   FOREACH(_target ${ARGN})
 
     # Add the include directories from the plugin dependencies

CMakeLists.txt

@@ -594,6 +594,12 @@ IF(CTK_SUPERBUILD)
   RETURN()
 ENDIF()
 
+
+#=============================================================================
+# End of Superbuild
+#=============================================================================
+
+
 #-----------------------------------------------------------------------------
 # Expand variables containing include and library directories for external projects
 # This relies on the variable EXTERNAL_TARGETS set in ctkMacroValidateBuildOptions
@@ -660,10 +666,11 @@ ENDIF()
 #-----------------------------------------------------------------------------
 # Configure files with settings
 #
-
 CONFIGURE_FILE(${CTK_SOURCE_DIR}/UseCTK.cmake.in
                ${CTK_SUPERBUILD_BINARY_DIR}/UseCTK.cmake COPYONLY IMMEDIATE)
 
+SET(CTK_CONFIG_H_INCLUDE_DIR ${CTK_BINARY_DIR})
+
 #-----------------------------------------------------------------------------
 # Set C/CXX Flags
 #

CTKConfig.cmake.in

@@ -67,6 +67,9 @@ INCLUDE("@CTK_CMAKE_DIR_CONFIG@/ctkMacroSetupExternalPlugins.cmake")
 
 SET(CTK_EXPORT_HEADER_TEMPLATE "@CTK_EXPORT_HEADER_TEMPLATE@")
 
+# Directory containing the ctkConfig.h file
+SET(CTK_CONFIG_H_INCLUDE_DIR @CTK_CONFIG_H_INCLUDE_DIR@)
+
 # The CTK DGraph executable used to compute target dependency graphs
 SET(CTK_DGRAPH_EXECUTABLE "@DGraph_EXECUTABLE@")
 

Plugins/org.commontk.configadmin/Testing/Cpp/ctkConfigAdminImplTestMain.cpp

@@ -22,6 +22,7 @@
 
 #include <QCoreApplication>
 
+#include <ctkConfig.h>
 #include <ctkPluginConstants.h>
 
 #include <Testing/Cpp/ctkPluginFrameworkTestRunner.h>
@@ -39,9 +40,9 @@ int main(int argc, char** argv)
 
   QString pluginDir;
 #ifdef CMAKE_INTDIR
-  pluginDir = qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
+  pluginDir = CTK_PLUGIN_DIR CMAKE_INTDIR "/";
 #else
-  pluginDir = qApp->applicationDirPath() + "/plugins/";
+  pluginDir = CTK_PLUGIN_DIR;
 #endif
 
   QString testpluginDir;

Plugins/org.commontk.eventadmin/Testing/Cpp/ctkEventAdminImplTestMain.cpp

@@ -22,6 +22,7 @@
 
 #include <QCoreApplication>
 
+#include <ctkConfig.h>
 #include <ctkPluginConstants.h>
 
 #include <Testing/Cpp/ctkPluginFrameworkTestRunner.h>
@@ -39,9 +40,9 @@ int main(int argc, char** argv)
 
   QString pluginDir;
 #ifdef CMAKE_INTDIR
-  pluginDir = qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
+  pluginDir = CTK_PLUGIN_DIR CMAKE_INTDIR "/";
 #else
-  pluginDir = qApp->applicationDirPath() + "/plugins/";
+  pluginDir = CTK_PLUGIN_DIR;
 #endif
 
   QString testpluginDir;

Plugins/org.commontk.metatype/Testing/Cpp/ctkMetaTypeImplTestMain.cpp

@@ -22,6 +22,7 @@
 
 #include <QCoreApplication>
 
+#include <ctkConfig.h>
 #include <ctkPluginConstants.h>
 
 #include <Testing/Cpp/ctkPluginFrameworkTestRunner.h>
@@ -39,9 +40,9 @@ int main(int argc, char** argv)
 
   QString pluginDir;
 #ifdef CMAKE_INTDIR
-  pluginDir = qApp->applicationDirPath() + "/../plugins/" CMAKE_INTDIR "/";
+  pluginDir = CTK_PLUGIN_DIR CMAKE_INTDIR "/";
 #else
-  pluginDir = qApp->applicationDirPath() + "/plugins/";
+  pluginDir = CTK_PLUGIN_DIR;
 #endif
 
   QString testpluginDir;

Utilities/LastConfigureStep/CTKGenerateCTKConfig.cmake

@@ -146,7 +146,7 @@ CONFIGURE_FILE(${CTK_SOURCE_DIR}/CTKConfig.cmake.in
 CONFIGURE_FILE(${CTK_SOURCE_DIR}/CTKConfigVersion.cmake.in
                ${CTK_SUPERBUILD_BINARY_DIR}/CTKConfigVersion.cmake @ONLY IMMEDIATE)
 CONFIGURE_FILE(${CTK_SOURCE_DIR}/ctkConfig.h.in
-               ${CTK_SUPERBUILD_BINARY_DIR}/ctkConfig.h @ONLY IMMEDIATE)
+               ${CTK_CONFIG_H_INCLUDE_DIR}/ctkConfig.h @ONLY IMMEDIATE)
 
 #-----------------------------------------------------------------------------
 # Settings specific to the install tree.