Corrected export headers workaround for Haiku.

Author: viferga

CMakeLists.txt

@@ -120,8 +120,24 @@ 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/Portability.cmake

@@ -63,11 +63,6 @@ if(PROJECT_OS_HAIKU)
 	set(PROJECT_OS_NAME "Haiku")
 	set(PROJECT_OS_FAMILY beos)
 	add_compile_definitions(__HAIKU__)
-
-	# Workaround to enable Haiku with export headers
-	set(WIN32 1)
-	include(GenerateExportHeader)
-	unset(WIN32)
 endif()
 
 # Check Windows