diff options
| author | Adrien Destugues <pulkomandy@pulkomandy.tk> | 2013-10-05 16:26:02 +0200 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-10-08 09:54:46 -0400 |
| commit | 7ebc1cb2ff3f79724711247be1edade38a3ef0f4 (patch) | |
| tree | b2b4b9fba63ae8a07571e8ced903e8cc0cc7587a /Modules/FindLua51.cmake | |
| parent | f59693b971819c0442657ed025ff009da6217103 (diff) | |
| download | cmake-7ebc1cb2ff3f79724711247be1edade38a3ef0f4.tar.gz | |
Haiku: Several fixes to platform module
* Do not define BEOS anymore (this includes workarounds which we don't
need most of the time in Haiku, so we prefer opt-in IF(HAIKU) in the
cmake files instead).
* On the other hand, do define UNIX (we are trying to be compliant) and
HAIKU (there is still a number of things we don't do like the
average UNIX clone)
* Do not use UnixPaths, as our filesystem hierarchy isn't anything like
what it expects.
* Do not use -nostart, which the compiler doesn't know about anymore.
This used to be an Haiku extension to gcc, and is equivalent to
-shared which is the default gcc option.
* While "dl" functions are provided in libroot, this is always
implicitly linked so there is no need to tell cmake about it.
* Forcing position-independent code is not needed, so remove it.
* On the other hand, include appropriate linker options for executables
and shared libraries.
* Support for the two available compilers in Haiku (gcc2 and gcc4) and
pick the right headers and libraries according to the currently
selected one.
* With the adoption of the package manager, the directory layout was
changed. Tell cmake where to look for header files and libraries.
* As we don't define BEOS anymore, enable the workaround we still need
for HAIKU as well. This is the lack of a libm (it is part of the
implicitly linked in libroot)
Applied-by: Rolf Eike Beer <eike@sf-mail.de>
Diffstat (limited to 'Modules/FindLua51.cmake')
| -rw-r--r-- | Modules/FindLua51.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake index a2bf0c0efa..770e93a1a7 100644 --- a/Modules/FindLua51.cmake +++ b/Modules/FindLua51.cmake @@ -54,7 +54,7 @@ find_library(LUA_LIBRARY if(LUA_LIBRARY) # include the math library for Unix - if(UNIX AND NOT APPLE AND NOT BEOS) + if(UNIX AND NOT APPLE AND NOT BEOS AND NOT HAIKU) find_library(LUA_MATH_LIBRARY m) set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") # For Windows and Mac, don't need to explicitly include the math library |