diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-29 20:03:56 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2018-09-29 20:26:22 +0000 |
| commit | eccdef5b6c90c58c25f1687cb8ab24c2d27490d5 (patch) | |
| tree | 4da7c470bd80d6c4b277329daba5606b16a21333 | |
| parent | Fix for bug:#1005036 (diff) | |
| download | inkscape-eccdef5b6c90c58c25f1687cb8ab24c2d27490d5.tar.gz inkscape-eccdef5b6c90c58c25f1687cb8ab24c2d27490d5.zip | |
CMake: Whitespace cleanup
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 158 |
1 files changed, 78 insertions, 80 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 9457d58df..f3663c353 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -29,33 +29,33 @@ endif() # Files we include # ---------------------------------------------------------------------------- if(WIN32) - # Set the link and include directories - get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) + # Set the link and include directories + get_property(dirs DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY INCLUDE_DIRECTORIES) - list(APPEND INKSCAPE_LIBS "-lmscms") + list(APPEND INKSCAPE_LIBS "-lmscms") - list(APPEND INKSCAPE_CXX_FLAGS "-mwindows") - list(APPEND INKSCAPE_CXX_FLAGS "-mthreads") + list(APPEND INKSCAPE_CXX_FLAGS "-mwindows") + list(APPEND INKSCAPE_CXX_FLAGS "-mthreads") - list(APPEND INKSCAPE_LIBS "-lgomp") - list(APPEND INKSCAPE_LIBS "-lwinpthread") + list(APPEND INKSCAPE_LIBS "-lgomp") + list(APPEND INKSCAPE_LIBS "-lwinpthread") - if(HAVE_MINGW64) - list(APPEND INKSCAPE_CXX_FLAGS "-m64") - else() - list(APPEND INKSCAPE_CXX_FLAGS "-m32") - endif() + if(HAVE_MINGW64) + list(APPEND INKSCAPE_CXX_FLAGS "-m64") + else() + list(APPEND INKSCAPE_CXX_FLAGS "-m32") + endif() endif() find_package(PkgConfig REQUIRED) pkg_check_modules(INKSCAPE_DEP REQUIRED - harfbuzz - pangocairo - pangoft2 - fontconfig - gsl - gmodule-2.0 - libsoup-2.4>=2.42) + harfbuzz + pangocairo + pangoft2 + fontconfig + gsl + gmodule-2.0 + libsoup-2.4>=2.42) list(APPEND INKSCAPE_LIBS ${INKSCAPE_DEP_LDFLAGS}) list(APPEND INKSCAPE_INCS_SYS ${INKSCAPE_DEP_INCLUDE_DIRS}) @@ -82,9 +82,9 @@ if(ENABLE_LCMS) unset(HAVE_LIBLCMS2) find_package(LCMS2) if(LCMS2_FOUND) - list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES}) - add_definitions(${LCMS2_DEFINITIONS}) + list(APPEND INKSCAPE_INCS_SYS ${LCMS2_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LCMS2_LIBRARIES}) + add_definitions(${LCMS2_DEFINITIONS}) set (HAVE_LIBLCMS2 ON) else() find_package(LCMS) @@ -117,17 +117,17 @@ add_definitions(${BOEHMGC_DEFINITIONS}) if(ENABLE_POPPLER) find_package(PopplerCairo) if(POPPLER_FOUND) - set(HAVE_POPPLER ON) - if(ENABLE_POPPLER_CAIRO) - if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) - set(HAVE_POPPLER_CAIRO ON) - endif() - if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) - set(HAVE_POPPLER_GLIB ON) - endif() - endif() + set(HAVE_POPPLER ON) + if(ENABLE_POPPLER_CAIRO) + if(POPPLER_CAIRO_FOUND AND POPPLER_GLIB_FOUND) + set(HAVE_POPPLER_CAIRO ON) + endif() + if(POPPLER_GLIB_FOUND AND CAIRO_SVG_FOUND) + set(HAVE_POPPLER_GLIB ON) + endif() + endif() else() - set(ENABLE_POPPLER_CAIRO OFF) + set(ENABLE_POPPLER_CAIRO OFF) endif() else() set(HAVE_POPPLER OFF) @@ -141,40 +141,40 @@ add_definitions(${POPPLER_DEFINITIONS}) if(WITH_LIBWPG) find_package(LibWPG) if(LIBWPG_FOUND) - set(WITH_LIBWPG01 ${LIBWPG-0.1_FOUND}) - set(WITH_LIBWPG02 ${LIBWPG-0.2_FOUND}) - set(WITH_LIBWPG03 ${LIBWPG-0.3_FOUND}) - list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LIBWPG_LIBRARIES}) - add_definitions(${LIBWPG_DEFINITIONS}) + set(WITH_LIBWPG01 ${LIBWPG-0.1_FOUND}) + set(WITH_LIBWPG02 ${LIBWPG-0.2_FOUND}) + set(WITH_LIBWPG03 ${LIBWPG-0.3_FOUND}) + list(APPEND INKSCAPE_INCS_SYS ${LIBWPG_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LIBWPG_LIBRARIES}) + add_definitions(${LIBWPG_DEFINITIONS}) else() - set(WITH_LIBWPG OFF) + set(WITH_LIBWPG OFF) endif() endif() if(WITH_LIBVISIO) find_package(LibVisio) if(LIBVISIO_FOUND) - set(WITH_LIBVISIO00 ${LIBVISIO-0.0_FOUND}) - set(WITH_LIBVISIO01 ${LIBVISIO-0.1_FOUND}) - list(APPEND INKSCAPE_INCS_SYS ${LIBVISIO_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LIBVISIO_LIBRARIES}) - add_definitions(${LIBVISIO_DEFINITIONS}) + set(WITH_LIBVISIO00 ${LIBVISIO-0.0_FOUND}) + set(WITH_LIBVISIO01 ${LIBVISIO-0.1_FOUND}) + list(APPEND INKSCAPE_INCS_SYS ${LIBVISIO_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LIBVISIO_LIBRARIES}) + add_definitions(${LIBVISIO_DEFINITIONS}) else() - set(WITH_LIBVISIO OFF) + set(WITH_LIBVISIO OFF) endif() endif() if(WITH_LIBCDR) find_package(LibCDR) if(LIBCDR_FOUND) - set(WITH_LIBCDR00 ${LIBCDR-0.0_FOUND}) - set(WITH_LIBCDR01 ${LIBCDR-0.1_FOUND}) - list(APPEND INKSCAPE_INCS_SYS ${LIBCDR_INCLUDE_DIRS}) - list(APPEND INKSCAPE_LIBS ${LIBCDR_LIBRARIES}) - add_definitions(${LIBCDR_DEFINITIONS}) + set(WITH_LIBCDR00 ${LIBCDR-0.0_FOUND}) + set(WITH_LIBCDR01 ${LIBCDR-0.1_FOUND}) + list(APPEND INKSCAPE_INCS_SYS ${LIBCDR_INCLUDE_DIRS}) + list(APPEND INKSCAPE_LIBS ${LIBCDR_LIBRARIES}) + add_definitions(${LIBCDR_DEFINITIONS}) else() - set(WITH_LIBCDR OFF) + set(WITH_LIBCDR OFF) endif() endif() @@ -208,26 +208,25 @@ endif() if(WITH_DBUS) pkg_check_modules(DBUS dbus-1 dbus-glib-1) if(DBUS_FOUND) - list(APPEND INKSCAPE_LIBS ${DBUS_LDFLAGS}) - list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/extension/dbus/) - list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES}) - add_definitions(${DBUS_CFLAGS_OTHER}) - + list(APPEND INKSCAPE_LIBS ${DBUS_LDFLAGS}) + list(APPEND INKSCAPE_INCS_SYS ${DBUS_INCLUDE_DIRS} ${CMAKE_BINARY_DIR}/src/extension/dbus/) + list(APPEND INKSCAPE_LIBS ${DBUS_LIBRARIES}) + add_definitions(${DBUS_CFLAGS_OTHER}) else() - set(WITH_DBUS OFF) + set(WITH_DBUS OFF) endif() endif() if(WITH_SVG2) - add_definitions(-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2) + add_definitions(-DWITH_MESH -DWITH_CSSBLEND -DWITH_CSSCOMPOSITE -DWITH_SVG2) else() - add_definitions(-UWITH_MESH -UWITH_CSSBLEND -UWITH_CSSCOMPOSITE -UWITH_SVG2) + add_definitions(-UWITH_MESH -UWITH_CSSBLEND -UWITH_CSSCOMPOSITE -UWITH_SVG2) endif() if(WITH_LPETOOL) - add_definitions(-DWITH_LPETOOL -DLPE_ENABLE_TEST_EFFECTS) + add_definitions(-DWITH_LPETOOL -DLPE_ENABLE_TEST_EFFECTS) else() - add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS) + add_definitions(-UWITH_LPETOOL -ULPE_ENABLE_TEST_EFFECTS) endif() # ---------------------------------------------------------------------------- @@ -304,20 +303,20 @@ add_definitions(${LIBXML2_DEFINITIONS}) if(WITH_OPENMP) find_package(OpenMP) if(OPENMP_FOUND) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") - list(APPEND INKSCAPE_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: - set(HAVE_OPENMP ON) - #list(APPEND INKSCAPE_LIBS "-lgomp") # FIXME + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}") + list(APPEND INKSCAPE_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: + set(HAVE_OPENMP ON) + #list(APPEND INKSCAPE_LIBS "-lgomp") # FIXME else() - set(HAVE_OPENMP OFF) - set(WITH_OPENMP OFF) + set(HAVE_OPENMP OFF) + set(WITH_OPENMP OFF) endif() endif() @@ -328,14 +327,13 @@ list(APPEND INKSCAPE_LIBS ${ZLIB_LIBRARIES}) if(WITH_IMAGE_MAGICK) pkg_check_modules(ImageMagick ImageMagick++ ) if(ImageMagick_FOUND) - list(APPEND INKSCAPE_LIBS ${ImageMagick_LDFLAGS}) add_definitions(${ImageMagick_CFLAGS_OTHER}) list(APPEND INKSCAPE_INCS_SYS ${ImageMagick_INCLUDE_DIRS}) list(APPEND INKSCAPE_LIBS ${ImageMagick_LIBRARIES}) - else() - set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' + else() + set(WITH_IMAGE_MAGICK OFF) # enable 'Extensions > Raster' endif() endif() @@ -343,10 +341,10 @@ set(ENABLE_NLS OFF) if(WITH_NLS) find_package(Gettext) if(GETTEXT_FOUND) - message(STATUS "Found gettext + msgfmt to convert language files. Translation enabled") - set(ENABLE_NLS ON) + message(STATUS "Found gettext + msgfmt to convert language files. Translation enabled") + set(ENABLE_NLS ON) else(GETTEXT_FOUND) - message(STATUS "Cannot find gettext + msgfmt to convert language file. Translation won't be enabled") + message(STATUS "Cannot find gettext + msgfmt to convert language file. Translation won't be enabled") endif(GETTEXT_FOUND) endif(WITH_NLS) |
