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

[Peter Kümmel]

SVN commit 1221615 by kuemmel:

fix search paths for pugins on osx, installer ...

 M  +9 -8      cmake/CMakeLists.txt  
 M  +2 -2      src/libkst/datasourcepluginmanager.cpp  


--- branches/work/kst/portto4/kst/cmake/CMakeLists.txt #1221614:1221615
@@ -294,28 +294,29 @@
 
 
 if(APPLE)
-	# We start from bin/kst2.app, all is build into the final bundle folder
+	# We start from build/bin/kst2.app, all is build into the final bundle folder
 	# On the mac the pathes to needed shared libraries are hardcoded in the binary/library 
 	# which could be changed by the macro 'fixup_bundle' 
 	# libs which are hardcoded are resolved automatically
 	# but the plugins must be passed as extra argument because they are not hardcoded in the binary 
 
-	set(app ${CMAKE_BINARY_DIR}/bin/${kst_binary_name}.app)
+	set(bundle_dir ${kst_build_dir}/bin)
 	set(contents_dir ${kst_binary_name}.app/Contents)
-	#TODO copy not intsall! 
-	install(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION  ${CMAKE_BINARY_DIR}/bin/${contents_dir}/plugins COMPONENT Runtime)
 	
-	file(WRITE ${CMAKE_BINARY_DIR}/qt.conf "")
-	install(FILES ${CMAKE_BINARY_DIR}/qt.conf DESTINATION ${contents_dir}/Resources COMPONENT Runtime)
+	set(app ${bundle_dir}/${kst_binary_name}.app)
+	install(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION ${bundle_dir}/${contents_dir}/plugins COMPONENT Runtime)
 	
 	install(CODE 
-		"file(GLOB qt_plugins \"\${CMAKE_BINARY_DIR}/${contents_dir}/plugins/imageformats/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
-		file(GLOB kst_plugins \"${CMAKE_BINARY_DIR}/bin/${contents_dir}/plugins/*${CMAKE_SHARED_MODULE_SUFFIX}\")
+		"file(GLOB qt_plugins \"${bundle_dir}/${contents_dir}/plugins/imageformats/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
+		file(GLOB kst_plugins \"${bundle_dir}/${contents_dir}/plugins/*${CMAKE_SHARED_MODULE_SUFFIX}\")
 		set(libs \${qt_plugins} \${kst_plugins})
 		include(BundleUtilities) 
 		fixup_bundle(\"${app}\" \"\${libs}\" \"${dir}\") "
 		COMPONENT RUNTIME)
 		
+	file(WRITE ${CMAKE_BINARY_DIR}/qt.conf "")
+	install(FILES ${CMAKE_BINARY_DIR}/qt.conf DESTINATION ${contents_dir}/Resources COMPONENT Runtime)
+
 	set(CPACK_GENERATOR DragNDrop)
 endif()
 
--- branches/work/kst/portto4/kst/src/libkst/datasourcepluginmanager.cpp #1221614:1221615
@@ -53,8 +53,8 @@
   QDir rootDir = QApplication::applicationDirPath();
   rootDir.cdUp();
   QString path = rootDir.canonicalPath() + "/";
-  path += QLatin1String(KST_INSTALL_PLUGINS);
-  pluginPaths << path;
+  pluginPaths << path + QLatin1String("plugins");
+  pluginPaths << path + QLatin1String(KST_INSTALL_PLUGINS);
   
   rootDir.cdUp();
   path = rootDir.canonicalPath() + "/";