summaryrefslogtreecommitdiffstats
path: root/Source/cmExportCommand.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-09 14:23:04 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-09 14:23:04 (GMT)
commite81b6742f72869a25e59230948a34a02f504046d (patch)
tree0587c80c7012a02ebec9ae43702f6065126fa742 /Source/cmExportCommand.cxx
parent7ed7d75a0418a1972dbb508e275d05c3ff5a78a6 (diff)
parent54ef2bea379ca47d961c1bb0fd0ccb026b482810 (diff)
downloadCMake-e81b6742f72869a25e59230948a34a02f504046d.zip
CMake-e81b6742f72869a25e59230948a34a02f504046d.tar.gz
CMake-e81b6742f72869a25e59230948a34a02f504046d.tar.bz2
Merge topic 'haiku-updates'
54ef2be Haiku: Include files cleanup in cmCTest 38d5555 Haiku: Remove outdated preprocessor checks 1dc61f8 Haiku: Remove use of B_COMMON_DIRECTORY 7ebc1cb Haiku: Several fixes to platform module
Diffstat (limited to 'Source/cmExportCommand.cxx')
-rw-r--r--Source/cmExportCommand.cxx14
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx
index 837bb39..422b038 100644
--- a/Source/cmExportCommand.cxx
+++ b/Source/cmExportCommand.cxx
@@ -20,7 +20,8 @@
#include "cmExportBuildFileGenerator.h"
#if defined(__HAIKU__)
-#include <StorageKit.h>
+#include <FindDirectory.h>
+#include <StorageDefs.h>
#endif
cmExportCommand::cmExportCommand()
@@ -319,14 +320,15 @@ void cmExportCommand::StorePackageRegistryDir(std::string const& package,
const char* hash)
{
#if defined(__HAIKU__)
- BPath dir;
- if (find_directory(B_USER_SETTINGS_DIRECTORY, &dir) != B_OK)
+ char dir[B_PATH_NAME_LENGTH];
+ if (find_directory(B_USER_SETTINGS_DIRECTORY, -1, false, dir, sizeof(dir)) !=
+ B_OK)
{
return;
}
- dir.Append("cmake/packages");
- dir.Append(package.c_str());
- std::string fname = dir.Path();
+ std::string fname = dir;
+ fname += "/cmake/packages/";
+ fname += package;
#else
const char* home = cmSystemTools::GetEnv("HOME");
if(!home)