Trying to simplify a bit the architecture in order to provide support for haiku.

Author: viferga

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
@@ -121,6 +120,7 @@ file(WRITE "${PROJECT_BINARY_DIR}/VERSION" "${META_NAME_VERSION}")
 #
 
 include(Portability)
+include(GenerateExportHeader)
 
 #
 # Compiler settings and options

cmake/CompileOptions.cmake

@@ -161,13 +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)
-	endif()
-
 	if(PROJECT_OS_HAIKU)
-		add_compile_options(-lpthread)
+		add_compile_options(-fPIC)
 	endif()
 
 	# All warnings that are not explicitly disabled are reported as errors
@@ -200,23 +195,19 @@ if (PROJECT_OS_FAMILY MATCHES "unix")
 	endif()
 endif()
 
-if(PROJECT_OS_FAMILY MATCHES "beos")
-	if(PROJECT_OS_HAIKU)
-		add_compile_options(-fPIC)
-	endif()
-endif()
-
 #
 # Linker options
 #
 
 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(MINGW)
+if(APPLE OR PROJECT_OS_LINUX OR MINGW)
+	# Enable threads in linux, macos and mingw
 	set(DEFAULT_LINKER_OPTIONS
 		-pthread
 	)
-	message(STATUS "-pthread enabled as compile flag")
+elseif(PROJECT_OS_HAIKU)
+	set(DEFAULT_LINKER_OPTIONS
+		-lpthread
+	)
 endif()