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/cmLocalGenerator.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/cmLocalGenerator.cxx')
| -rw-r--r-- | Source/cmLocalGenerator.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index afc04b9..d7f36c2 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -37,7 +37,8 @@ #include <assert.h> #if defined(__HAIKU__) -#include <StorageKit.h> +#include <FindDirectory.h> +#include <StorageDefs.h> #endif cmLocalGenerator::cmLocalGenerator() @@ -349,16 +350,17 @@ void cmLocalGenerator::GenerateInstallRules() prefix = prefix_win32.c_str(); } #elif defined(__HAIKU__) + char dir[B_PATH_NAME_LENGTH]; if (!prefix) { - BPath dir; - if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK) + if (find_directory(B_SYSTEM_DIRECTORY, -1, false, dir, sizeof(dir)) + == B_OK) { - prefix = dir.Path(); + prefix = dir; } else { - prefix = "/boot/common"; + prefix = "/boot/system"; } } #else |