From c9c59ee6f084f33765df548d0a0163ce8ef23e1f Mon Sep 17 00:00:00 2001 From: su_v 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