Page MenuHomePhabricator
Files F451

setup.patch
Public
Actions

Authored By
baumhaue
Feb 4 2010, 11:55 AM
Size
2 KB
Referenced Files
None
Subscribers
None

setup.patch
View Options

Index: mitk/BlueBerry/Bundles/org.blueberry.osgi/src/berryBundleLoader.cpp
===================================================================
--- mitk/BlueBerry/Bundles/org.blueberry.osgi/src/berryBundleLoader.cpp (revision 21197)
+++ mitk/BlueBerry/Bundles/org.blueberry.osgi/src/berryBundleLoader.cpp (working copy)
@@ -205,6 +205,19 @@
{
std::vector<std::string> tmpList;
bundle->GetStorage().List(baseDir, tmpList);
+
+#ifdef CMAKE_INTDIR
+ //std::string buildTypeSubDir(BERRY_BUILD_TYPE);
+
+ std::vector<std::string> tmpListBuildType;
+ bundle->GetStorage().List(baseDir + CMAKE_INTDIR, tmpListBuildType);
+ for (std::vector<std::string>::const_iterator i = tmpListBuildType.begin();
+ i != tmpListBuildType.end(); ++i)
+ {
+ tmpList.push_back(std::string("") + CMAKE_INTDIR + "/" + *i);
+ }
+
+#endif
std::string::size_type suf = Poco::SharedLibrary::suffix().size();
std::vector<std::string>::iterator iter;
Index: mitk/BlueBerry/Bundles/org.blueberry.osgi/src/berryBundleLoader.h
===================================================================
--- mitk/BlueBerry/Bundles/org.blueberry.osgi/src/berryBundleLoader.h (revision 21197)
+++ mitk/BlueBerry/Bundles/org.blueberry.osgi/src/berryBundleLoader.h (working copy)
@@ -34,11 +34,6 @@
#include "internal/berryBundle.h"
#include "internal/berrySystemBundle.h"
-#ifdef CMAKE_INTDIR
- #define BERRY_DEFAULT_LIBRARY_DIR "bin/" CMAKE_INTDIR "/"
-#else
- #define BERRY_DEFAULT_LIBRARY_DIR "bin/"
-#endif
namespace berry {
@@ -108,7 +103,7 @@
void ReadContributions(SmartPointer<IBundle> bundle);
void ReadDependentContributions(SmartPointer<IBundle> bundle);
- void ListLibraries(SmartPointer<IBundle> bundle, std::vector<std::string>& list, const std::string& baseDir = BERRY_DEFAULT_LIBRARY_DIR);
+ void ListLibraries(SmartPointer<IBundle> bundle, std::vector<std::string>& list, const std::string& baseDir = "bin/");
void InstallLibraries(SmartPointer<IBundle> bundle, bool copy = false);
// start all resolved bundles, except the system bundle

File Metadata

Mime Type
application/octet-stream
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
433
Default Alt Text
setup.patch (2 KB)

Event Timeline

baumhaue added a comment.Feb 4 2010, 11:55 AM

fixes runtime error of windows installer

MITK · MIC · IMSY · DKFZ