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>
This commit is contained in:
Adrien Destugues 2013-10-05 16:26:02 +02:00 committed by Brad King
parent f59693b971
commit 7ebc1cb2ff
4 changed files with 117 additions and 16 deletions

View File

@ -54,7 +54,7 @@ find_library(LUA_LIBRARY
if(LUA_LIBRARY) if(LUA_LIBRARY)
# include the math library for Unix # 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) find_library(LUA_MATH_LIBRARY m)
set( LUA_LIBRARIES "${LUA_LIBRARY};${LUA_MATH_LIBRARY}" CACHE STRING "Lua Libraries") 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 # For Windows and Mac, don't need to explicitly include the math library

View File

@ -1,22 +1,123 @@
set(BEOS 1) # process only once
if(HAIKU)
return()
endif()
set(CMAKE_DL_LIBS root be) set(HAIKU 1)
set(CMAKE_C_COMPILE_OPTIONS_PIC "-fPIC") set(UNIX 1)
set(CMAKE_C_COMPILE_OPTIONS_PIE "-fPIE")
set(CMAKE_DL_LIBS "")
set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") set(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-nostart") set(CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS "-shared")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,") set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG "-Wl,-rpath,")
set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") set(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":")
set(CMAKE_SHARED_LIBRARY_RPATH_LINK_C_FLAG "-Wl,-rpath-link,")
set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,") set(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "-Wl,-soname,")
set(CMAKE_EXE_EXPORTS_C_FLAG "-Wl,--export-dynamic")
include(Platform/UnixPaths) # Determine, if the C or C++ compiler is configured for a secondary
list(APPEND CMAKE_SYSTEM_PREFIX_PATH /boot/common) # architecture. If so, that will change the search paths we set below. We check
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/common/include) # whether the compiler's library search paths contain a
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/common/lib) # "/boot/system/develop/lib/<subdir>/", which we assume to be the secondary
list(APPEND CMAKE_SYSTEM_PROGRAM_PATH /boot/common/bin) # architecture specific subdirectory and extract the name of the architecture
list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES /boot/common/lib) # accordingly.
list(APPEND CMAKE_SYSTEM_INCLUDE_PATH /boot/develop/headers/3rdparty) set(__HAIKU_COMPILER ${CMAKE_C_COMPILER})
list(APPEND CMAKE_SYSTEM_LIBRARY_PATH /boot/develop/lib/x86)
if(NOT __HAIKU_COMPILER)
set(__HAIKU_COMPILER ${CMAKE_CXX_COMPILER})
endif()
execute_process(
COMMAND ${__HAIKU_COMPILER} -print-search-dirs
OUTPUT_VARIABLE _HAIKU_SEARCH_DIRS
OUTPUT_STRIP_TRAILING_WHITESPACE)
string(REGEX MATCH ".*\nlibraries: =?([^\n]*:)?/boot/system/develop/lib/([^/]*)/(:[^\n]*)?\n.*" _dummy "\n${_HAIKU_SEARCH_DIRS}\n")
set(CMAKE_HAIKU_SECONDARY_ARCH "${CMAKE_MATCH_2}")
if(NOT CMAKE_HAIKU_SECONDARY_ARCH)
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "")
unset(CMAKE_HAIKU_SECONDARY_ARCH)
else()
set(CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR "/${CMAKE_HAIKU_SECONDARY_ARCH}")
# Override CMAKE_*LIBRARY_ARCHITECTURE. This will cause FIND_LIBRARY to search
# the libraries in the correct subdirectory first. It still isn't completely
# correct, since the parent directories shouldn't be searched at all. The
# primary architecture library might still be found, if there isn't one
# installed for the secondary architecture or it is installed in a less
# specific location.
set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH})
set(CMAKE_C_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH})
set(CMAKE_CXX_LIBRARY_ARCHITECTURE ${CMAKE_HAIKU_SECONDARY_ARCH})
endif()
list(APPEND CMAKE_SYSTEM_PREFIX_PATH
/boot/common/non-packaged
/boot/common
/boot/system
)
LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES
/boot/common/non-packaged/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
/boot/common/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
/boot/system/develop/headers/os
/boot/system/develop/headers/os/app
/boot/system/develop/headers/os/device
/boot/system/develop/headers/os/drivers
/boot/system/develop/headers/os/game
/boot/system/develop/headers/os/interface
/boot/system/develop/headers/os/kernel
/boot/system/develop/headers/os/locale
/boot/system/develop/headers/os/mail
/boot/system/develop/headers/os/media
/boot/system/develop/headers/os/midi
/boot/system/develop/headers/os/midi2
/boot/system/develop/headers/os/net
/boot/system/develop/headers/os/opengl
/boot/system/develop/headers/os/storage
/boot/system/develop/headers/os/support
/boot/system/develop/headers/os/translation
/boot/system/develop/headers/os/add-ons/graphics
/boot/system/develop/headers/os/add-ons/input_server
/boot/system/develop/headers/os/add-ons/screen_saver
/boot/system/develop/headers/os/add-ons/tracker
/boot/system/develop/headers/os/be_apps/Deskbar
/boot/system/develop/headers/os/be_apps/NetPositive
/boot/system/develop/headers/os/be_apps/Tracker
/boot/system/develop/headers/3rdparty
/boot/system/develop/headers/bsd
/boot/system/develop/headers/glibc
/boot/system/develop/headers/gnu
/boot/system/develop/headers/posix
/boot/system/develop/headers${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
)
IF (CMAKE_HAIKU_SECONDARY_ARCH)
LIST(APPEND CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES
/boot/system/develop/headers
)
ENDIF (CMAKE_HAIKU_SECONDARY_ARCH)
LIST(APPEND CMAKE_HAIKU_C_INCLUDE_DIRECTORIES
${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES}
)
LIST(APPEND CMAKE_HAIKU_CXX_INCLUDE_DIRECTORIES
${CMAKE_HAIKU_COMMON_INCLUDE_DIRECTORIES})
LIST(APPEND CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_HAIKU_C_INCLUDE_DIRECTORIES})
LIST(APPEND CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES
/boot/common/non-packaged/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
/boot/common/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
/boot/system/develop/lib${CMAKE_HAIKU_SECONDARY_ARCH_SUBDIR}
)
LIST(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES}
)
LIST(APPEND CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_HAIKU_DEVELOP_LIB_DIRECTORIES})
if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH set(CMAKE_INSTALL_PREFIX "/boot/common" CACHE PATH

View File

@ -51,7 +51,7 @@ define_property(
FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" FULL_DOCS "A simple etst proerty that means nothign and is used for nothing"
) )
set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR)
if(NOT BEOS AND NOT WIN32) # No libm on BeOS. if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS.
set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
endif() endif()
get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO)

View File

@ -51,7 +51,7 @@ define_property(
FULL_DOCS "A simple etst proerty that means nothign and is used for nothing" FULL_DOCS "A simple etst proerty that means nothign and is used for nothing"
) )
set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR) set_target_properties(CMakeTestCLibraryShared PROPERTIES FOO BAR)
if(NOT BEOS AND NOT WIN32) # No libm on BeOS. if(NOT BEOS AND NOT WIN32 AND NOT HAIKU) # No libm on BeOS.
set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm") set_target_properties(CMakeTestCLibraryShared PROPERTIES LINK_FLAGS "-lm")
endif() endif()
get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO) get_target_property(FOO_BAR_VAR CMakeTestCLibraryShared FOO)