Merge https://github.com/metacall/core into develop

Author: m-tabaza

CMakeLists.txt

@@ -29,7 +29,6 @@ cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
 list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 set(WriterCompilerDetectionHeaderFound NOTFOUND)
 
-include(GenerateExportHeader)
 include(ExternalProject)
 
 # This module is only available with CMake >=3.1, so check whether it could be found
@@ -122,6 +121,23 @@ file(WRITE "${PROJECT_BINARY_DIR}/VERSION" "${META_NAME_VERSION}")
 
 include(Portability)
 
+#
+# Define Export Headers
+#
+
+include(GenerateExportHeader)
+
+# Workaround to enable Haiku with export headers
+# This can be removed once export headers support Haiku
+if(PROJECT_OS_HAIKU)
+	function(GENERATE_EXPORT_HEADER)
+		set(WIN32 1)
+		# When the function is redefined, the old function can be accessed through underscore
+		_GENERATE_EXPORT_HEADER(${ARGN})
+		unset(WIN32)
+	endfunction()
+endif()
+
 #
 # Compiler settings and options
 #

cmake/CompileOptions.cmake

@@ -13,6 +13,7 @@ string(TOUPPER ${CMAKE_SYSTEM_NAME} SYSTEM_NAME_UPPER)
 
 # Determine architecture (32/64 bit)
 set(X64 OFF)
+
 if(CMAKE_SIZEOF_VOID_P EQUAL 8)
 	set(X64 ON)
 endif()
@@ -160,9 +161,8 @@ if (PROJECT_OS_FAMILY MATCHES "unix")
 		add_compile_options(-Wreturn-stack-address)
 	endif()
 
-	if(PROJECT_OS_LINUX)
-		# Enable threads in linux
-		add_compile_options(-pthread)
+	if(PROJECT_OS_HAIKU)
+		add_compile_options(-fPIC)
 	endif()
 
 	# All warnings that are not explicitly disabled are reported as errors
@@ -201,9 +201,13 @@ endif()
 
 set(DEFAULT_LINKER_OPTIONS)
 
-# Use pthreads on mingw and linux
-if(("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") OR "${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
+if(APPLE OR PROJECT_OS_LINUX OR MINGW)
+	# Enable threads in linux, macos and mingw
 	set(DEFAULT_LINKER_OPTIONS
 		-pthread
 	)
+elseif(PROJECT_OS_HAIKU)
+	set(DEFAULT_LINKER_OPTIONS
+		-lpthread
+	)
 endif()

cmake/Portability.cmake

@@ -54,6 +54,17 @@ if(PROJECT_OS_SOLARIS)
 	set(PROJECT_OS_FAMILY unix)
 endif()
 
+# Check Haiku
+string(REGEX MATCH "Haiku" PROJECT_OS_HAIKU ${CMAKE_SYSTEM_NAME})
+
+if(PROJECT_OS_HAIKU)
+	set(HAIKU 1)
+	set(PROJECT_OS_HAIKU TRUE BOOL INTERNAL)
+	set(PROJECT_OS_NAME "Haiku")
+	set(PROJECT_OS_FAMILY beos)
+	add_compile_definitions(__HAIKU__)
+endif()
+
 # Check Windows
 if(WIN32)
 	set(PROJECT_OS_WIN TRUE BOOL INTERNAL)

source/adt/CMakeLists.txt

@@ -144,6 +144,7 @@ target_link_libraries(${target}
 	${META_PROJECT_NAME}::version
 	${META_PROJECT_NAME}::preprocessor
 	${META_PROJECT_NAME}::format
+	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
 
 	PUBLIC

source/configuration/CMakeLists.txt

@@ -140,6 +140,7 @@ target_link_libraries(${target}
 	${META_PROJECT_NAME}::preprocessor
 	${META_PROJECT_NAME}::environment
 	${META_PROJECT_NAME}::format
+	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
 	${META_PROJECT_NAME}::memory
 	${META_PROJECT_NAME}::portability

source/detour/CMakeLists.txt

@@ -140,6 +140,7 @@ target_link_libraries(${target}
 	${META_PROJECT_NAME}::preprocessor
 	${META_PROJECT_NAME}::environment
 	${META_PROJECT_NAME}::format
+	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
 	${META_PROJECT_NAME}::memory
 	${META_PROJECT_NAME}::portability

source/detours/CMakeLists.txt

@@ -12,6 +12,7 @@ set(DETOUR_MODULE_NAMES
 	preprocessor
 	environment
 	format
+	threading
 	log
 	memory
 	portability

source/dynlink/CMakeLists.txt

@@ -161,6 +161,7 @@ target_link_libraries(${target}
 	${META_PROJECT_NAME}::version
 	${META_PROJECT_NAME}::preprocessor
 	${META_PROJECT_NAME}::format
+	${META_PROJECT_NAME}::threading
 	${META_PROJECT_NAME}::log
 
 	PUBLIC

source/dynlink/include/dynlink/dynlink.h

@@ -1,9 +1,21 @@
 /*
  *	Dynamic Link Library by Parra Studios
- *	Copyright (C) 2009 - 2016 Vicente Eduardo Ferrer Garcia <[email protected]>
- *
  *	A library for dynamic loading and linking shared objects at run-time.
  *
+ *	Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
  */
 
 #ifndef DYNLINK_H

source/dynlink/include/dynlink/dynlink_flags.h

@@ -1,9 +1,21 @@
 /*
  *	Dynamic Link Library by Parra Studios
- *	Copyright (C) 2009 - 2016 Vicente Eduardo Ferrer Garcia <[email protected]>
- *
  *	A library for dynamic loading and linking shared objects at run-time.
  *
+ *	Copyright (C) 2016 - 2021 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
  */
 
 #ifndef DYNLINK_FLAGS_H