From b04b97839a468ee159467a55873f8f2cc8842310 Mon Sep 17 00:00:00 2001
From: su_v <suv-sf@users.sourceforge.net>
Date: Sat, 9 May 2015 19:17:03 +0200
Subject: cmake: add configuration option for OpenMP

(bzr r14138)
---
 CMakeScripts/DefineDependsandFlags.cmake | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index dceed9560..13471d83a 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -46,10 +46,6 @@ else()
 	list(APPEND INKSCAPE_LIBS "-lX11")  # FIXME
 endif()
 
-if(NOT APPLE)
-	# FIXME: should depend on availability of OpenMP support (see below) (?)
-	list(APPEND INKSCAPE_LIBS "-lgomp")  # FIXME
-endif()
 list(APPEND INKSCAPE_LIBS "-lgslcblas")  # FIXME
 
 if(WITH_GNOME_VFS)
@@ -316,15 +312,22 @@ list(APPEND INKSCAPE_INCS_SYS ${LIBXML2_INCLUDE_DIR})
 list(APPEND INKSCAPE_LIBS ${LIBXML2_LIBRARIES})
 add_definitions(${LIBXML2_DEFINITIONS})
 
-find_package(OpenMP)
-if(OpenMP_FOUND)
-	set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
-	if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode")
-		set(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES")
+if(WITH_OPENMP)
+	find_package(OpenMP)
+	if(OpenMP_FOUND)
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
+		if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode")
+			set(CMAKE_XCODE_ATTRIBUTE_ENABLE_OPENMP_SUPPORT "YES")
+		endif()
+		mark_as_advanced(OpenMP_C_FLAGS)
+		mark_as_advanced(OpenMP_CXX_FLAGS)
+		# '-fopenmp' is in OpenMP_C_FLAGS, OpenMP_CXX_FLAGS and implies '-lgomp'
+		# uncomment explicit linking below if still needed:
+		#list(APPEND INKSCAPE_LIBS "-lgomp")  # FIXME
+	else()
+		set(WITH_OPENMP OFF)
 	endif()
-	mark_as_advanced(OpenMP_C_FLAGS)
-	mark_as_advanced(OpenMP_CXX_FLAGS)
 endif()
 
 find_package(ZLIB REQUIRED)
-- 
cgit v1.2.3


From c9c59ee6f084f33765df548d0a0163ce8ef23e1f Mon Sep 17 00:00:00 2001
From: su_v <suv-sf@users.sourceforge.net>
Date: Sat, 9 May 2015 23:13:52 +0200
Subject: cmake: fix OpenMP detection and defines (inkscape uses 'HAVE_OPENMP')

(bzr r14141)
---
 CMakeScripts/DefineDependsandFlags.cmake | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'CMakeScripts')

diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake
index 13471d83a..a4dad21b1 100644
--- a/CMakeScripts/DefineDependsandFlags.cmake
+++ b/CMakeScripts/DefineDependsandFlags.cmake
@@ -314,7 +314,7 @@ add_definitions(${LIBXML2_DEFINITIONS})
 
 if(WITH_OPENMP)
 	find_package(OpenMP)
-	if(OpenMP_FOUND)
+	if(OPENMP_FOUND)
 		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
 		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
 		if(APPLE AND ${CMAKE_GENERATOR} MATCHES "Xcode")
@@ -324,8 +324,10 @@ if(WITH_OPENMP)
 		mark_as_advanced(OpenMP_CXX_FLAGS)
 		# '-fopenmp' is in OpenMP_C_FLAGS, OpenMP_CXX_FLAGS and implies '-lgomp'
 		# uncomment explicit linking below if still needed:
+		set(HAVE_OPENMP ON)
 		#list(APPEND INKSCAPE_LIBS "-lgomp")  # FIXME
 	else()
+		set(HAVE_OPENMP OFF)
 		set(WITH_OPENMP OFF)
 	endif()
 endif()
-- 
cgit v1.2.3