diff options
| author | Adrien Destugues <pulkomandy@pulkomandy.tk> | 2013-10-05 14:31:36 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-08 13:55:38 (GMT) |
| commit | 1dc61f814277744581bb36ae40c91893c1bef851 (patch) | |
| tree | 47b16a4ddc6daf294f6556e0af2dbb69f1d75e28 /Source/cmExportCommand.cxx | |
| parent | 7ebc1cb2ff3f79724711247be1edade38a3ef0f4 (diff) | |
| download | CMake-1dc61f814277744581bb36ae40c91893c1bef851.zip CMake-1dc61f814277744581bb36ae40c91893c1bef851.tar.gz CMake-1dc61f814277744581bb36ae40c91893c1bef851.tar.bz2 | |
Haiku: Remove use of B_COMMON_DIRECTORY
The common directory was removed in Haiku. Applications are now
installed in the system directory.
Applied-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'Source/cmExportCommand.cxx')
| -rw-r--r-- | Source/cmExportCommand.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Source/cmExportCommand.cxx b/Source/cmExportCommand.cxx index f059ceb..729f007 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() @@ -316,14 +317,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) |