diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2015-05-09 22:39:10 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2015-05-09 22:39:10 +0000 |
| commit | 8428f469cdd424a5240cc804b05f39eed8c95104 (patch) | |
| tree | e0d59ca4ca42400e6972b53814ba58b2e27dce46 | |
| parent | fixing review (diff) | |
| parent | cmake: fix OpenMP detection and defines (inkscape uses 'HAVE_OPENMP') (diff) | |
| download | inkscape-8428f469cdd424a5240cc804b05f39eed8c95104.tar.gz inkscape-8428f469cdd424a5240cc804b05f39eed8c95104.zip | |
update to trunk
(bzr r13645.1.88)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 4 | ||||
| -rw-r--r-- | config.h.cmake | 3 |
2 files changed, 6 insertions, 1 deletions
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() diff --git a/config.h.cmake b/config.h.cmake index 3bd7837bd..c793f59b6 100644 --- a/config.h.cmake +++ b/config.h.cmake @@ -116,6 +116,9 @@ /* Define to 1 if you have the `mkdir' function. */ #cmakedefine HAVE_MKDIR 1 +/* Use OpenMP (via cmake) */ +#cmakedefine HAVE_OPENMP 1 + /* Use aspell for built-in spellchecker */ #cmakedefine HAVE_ASPELL 1 |