diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-06-15 08:19:02 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-06-15 08:19:02 +0000 |
| commit | 521ff01fbdb678fe649138a6d8b482dc792fa5fc (patch) | |
| tree | 12e44a2fd655a786385ca3b90b0bf7e5c9ca0dea | |
| parent | Clean up deprecated GTK_WIDGET API (diff) | |
| download | inkscape-521ff01fbdb678fe649138a6d8b482dc792fa5fc.tar.gz inkscape-521ff01fbdb678fe649138a6d8b482dc792fa5fc.zip | |
Attempt to make ImageMagick and OpenMP optional with cmake.
(bzr r10306)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index c374eec0e..c64cb6fdf 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -113,21 +113,25 @@ list(APPEND INKSCAPE_LIBS ${LIBXML2_LIBRARIES}) add_definitions(${LIBXML2_DEFINITIONS}) find_package(OpenMP REQUIRED) # cmake's -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) +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) +endif(OpenMP_FOUND) find_package(ZLIB REQUIRED) list(APPEND INKSCAPE_INCS ${ZLIB_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) -find_package(ImageMagick COMPONENTS MagickCore Magick++ REQUIRED) -list(APPEND INKSCAPE_INCS ${ImageMagick_MagickCore_INCLUDE_DIR}) -list(APPEND INKSCAPE_LIBS ${ImageMagick_Magick++_LIBRARY}) +find_package(ImageMagick COMPONENTS MagickCore Magick++) +if(ImageMagick_FOUND) + list(APPEND INKSCAPE_INCS ${ImageMagick_MagickCore_INCLUDE_DIR}) + list(APPEND INKSCAPE_LIBS ${ImageMagick_Magick++_LIBRARY}) +endif(ImageMagick_FOUND) include(IncludeJava) # end Dependencies |