[Kst] branches/work/kst/portto4/kst

[Peter Kümmel]

SVN commit 1220066 by kuemmel:

also load ds plugins in Xcode

 M  +1 -1      cmake/CMakeLists.txt  
 M  +1 -1      cmake/modules/KstMacros.cmake  
 M  +5 -2      src/libkst/datasourcepluginmanager.cpp  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1220065:1220066
@@ -118,7 +118,7 @@
 	set(kst_qtmain_library ${QT_QTMAIN_LIBRARY})
 endif()
 
-if(APPLE)
+if(APPLE AND NOT CMAKE_GENERATOR STREQUAL Xcode)
 	set(kst_win32 MACOSX_BUNDLE)
 endif()
 
--- branches/work/kst/portto4/kst/cmake/modules/KstMacros.cmake #1220065:1220066
@@ -127,7 +127,7 @@
 
 macro(kst_init_plugin dir)
 	set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
-	if(APPLE)
+	if(APPLE AND NOT CMAKE_GENERATOR STREQUAL Xcode)
 	    set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/${kst_binary_name}.app/Contents/plugins)
 	else()
 		set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/plugins)
--- branches/work/kst/portto4/kst/src/libkst/datasourcepluginmanager.cpp #1220065:1220066
@@ -151,9 +151,12 @@
   
   pluginPath = rootDir.canonicalPath();
   pluginPath += QDir::separator();
-  pluginPath += QLatin1String("PlugIns");
-  pluginPaths << pluginPath;
+  pluginPaths << pluginPath + QLatin1String("PlugIns");
+  pluginPaths << pluginPath + QLatin1String("../PlugIns/Release");
+  pluginPaths << pluginPath + QLatin1String("../PlugIns/Debug");
 
+  Debug::self()->log(QString("\nPlugin Search Pathes: \n%1").arg(pluginPaths.join("\n")));
+	
   foreach (const QString& pluginPath, pluginPaths) {
     QDir d(pluginPath);
     foreach (QString fileName, d.entryList(QDir::Files)) {