mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-23 07:28:51 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix default install prefix on Haiku

Browse Source 
Since Haiku does not have /usr (and therefore /usr/local), this commit
changes the default install prefix to the equivalent directory of
/boot/common.

See issue #9607.
This commit is contained in:
Brad King
2009-09-30 08:31:53 -04:00
parent 27c04be03a
commit f40406ed6b
4 changed files with 38 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Source/CPack/cmCPackGenerator.cxx
View File

@@ -25,6 +25,10 @@
#include <cmsys/Glob.hxx>
#include <memory> // auto_ptr
#if defined(__HAIKU__)
#include <StorageKit.h>
#endif
//----------------------------------------------------------------------
cmCPackGenerator::cmCPackGenerator()
{
@@ -1020,6 +1024,16 @@ const char* cmCPackGenerator::GetInstallPath()
this->InstallPath += this->GetOption("CPACK_PACKAGE_NAME");
this->InstallPath += "-";
this->InstallPath += this->GetOption("CPACK_PACKAGE_VERSION");
#elif defined(__HAIKU__)
BPath dir;
if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
{
this->InstallPath = dir.Path();
}
else
{
this->InstallPath = "/boot/common";
}
#else
this->InstallPath = "/usr/local/";
#endif

17
Source/cmLocalGenerator.cxx
View File

@@ -36,6 +36,10 @@
#include <assert.h>
#if defined(__HAIKU__)
#include <StorageKit.h>
#endif
cmLocalGenerator::cmLocalGenerator()
{
this->Makefile = 0; // moved to after set on global
@@ -357,6 +361,19 @@ void cmLocalGenerator::GenerateInstallRules()
}
prefix = prefix_win32.c_str();
}
#elif defined(__HAIKU__)
if (!prefix)
{
BPath dir;
if (find_directory(B_COMMON_DIRECTORY, &dir) == B_OK)
{
prefix = dir.Path();
}
else
{
prefix = "/boot/common";
}
}
#else
if (!prefix)
{