diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-09 10:23:04 -0400 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-09 10:23:04 -0400 |
| commit | e81b6742f72869a25e59230948a34a02f504046d (patch) | |
| tree | 0587c80c7012a02ebec9ae43702f6065126fa742 /Source/cmLocalGenerator.cxx | |
| parent | 7ed7d75a0418a1972dbb508e275d05c3ff5a78a6 (diff) | |
| parent | 54ef2bea379ca47d961c1bb0fd0ccb026b482810 (diff) | |
| download | cmake-e81b6742f72869a25e59230948a34a02f504046d.tar.gz | |
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/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 b4cb5bd1f3..9174e260bd 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 |