r21543 by craig - Switch to lower case CMake commands
scribus-commit
scribus-commit at lists.scribus.net
Sun Nov 27 21:37:35 UTC 2016
Author: craig
Date: Sun Nov 27 21:37:34 2016
New Revision: 21543
URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=21543
Log:
Switch to lower case CMake commands
Modified:
trunk/Scribus/CMakeLists.txt
trunk/Scribus/cmake/modules/CAIROConfig.cmake
trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake
trunk/Scribus/cmake/modules/FREETYPEConfig.cmake
trunk/Scribus/cmake/modules/FindGMAGICK.cmake
trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
trunk/Scribus/cmake/modules/FindHYPHEN.cmake
trunk/Scribus/cmake/modules/FindLCMS.cmake
trunk/Scribus/cmake/modules/FindLCMS2.cmake
trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake
trunk/Scribus/cmake/modules/FindOSG.cmake
trunk/Scribus/cmake/modules/FindPOPPLER.cmake
trunk/Scribus/cmake/modules/FindZLIB.cmake
trunk/Scribus/cmake/modules/LibXml2Config.cmake
trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake
trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake
trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake
trunk/Scribus/cmake/modules/cmakeconfigreport.cmake
trunk/Scribus/cmake_uninstall.cmake.in
trunk/Scribus/doc/CMakeLists.txt
trunk/Scribus/doc/cs/CMakeLists.txt
trunk/Scribus/doc/cs/tutorials/short-words/CMakeLists.txt
trunk/Scribus/doc/de/CMakeLists.txt
trunk/Scribus/doc/de/images/CMakeLists.txt
trunk/Scribus/doc/en/CMakeLists.txt
trunk/Scribus/doc/en/images/CMakeLists.txt
trunk/Scribus/doc/en/tutorials/short-words/CMakeLists.txt
trunk/Scribus/doc/fr/CMakeLists.txt
trunk/Scribus/doc/fr/tutorials/short-words/CMakeLists.txt
trunk/Scribus/doc/it/CMakeLists.txt
trunk/Scribus/doc/it/images/CMakeLists.txt
trunk/Scribus/doc/pl/CMakeLists.txt
trunk/Scribus/doc/pl/tutorials/short-words/CMakeLists.txt
trunk/Scribus/resources/dicts/CMakeLists.txt
trunk/Scribus/resources/editorconfig/CMakeLists.txt
trunk/Scribus/resources/iconsets/CMakeLists.txt
trunk/Scribus/resources/keysets/CMakeLists.txt
trunk/Scribus/resources/loremipsum/CMakeLists.txt
trunk/Scribus/resources/manpages/CMakeLists.txt
trunk/Scribus/resources/profiles/CMakeLists.txt
trunk/Scribus/resources/swatches/CMakeLists.txt
trunk/Scribus/resources/templates/CMakeLists.txt
trunk/Scribus/resources/translations/CMakeLists.txt
trunk/Scribus/scribus/CMakeLists.txt
trunk/Scribus/scribus/colormgmt/CMakeLists.txt
trunk/Scribus/scribus/desaxe/CMakeLists.txt
trunk/Scribus/scribus/designer/CMakeLists.txt
trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
trunk/Scribus/scribus/dtd/CMakeLists.txt
trunk/Scribus/scribus/fonts/CMakeLists.txt
trunk/Scribus/scribus/plugins/CMakeLists.txt
trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
trunk/Scribus/scribus/plugins/export/CMakeLists.txt
trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
trunk/Scribus/scribus/plugins/fileloader/CMakeLists.txt
trunk/Scribus/scribus/plugins/fileloader/oldscribusformat/CMakeLists.txt
trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt
trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt
trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt
trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
trunk/Scribus/scribus/plugins/scriptplugin/samples/CMakeLists.txt
trunk/Scribus/scribus/plugins/scriptplugin/scripts/CMakeLists.txt
trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
trunk/Scribus/scribus/relaxng/CMakeLists.txt
trunk/Scribus/scribus/styles/CMakeLists.txt
trunk/Scribus/scribus/tests/CMakeLists.txt
trunk/Scribus/scribus/text/CMakeLists.txt
trunk/Scribus/scribus/third_party/CMakeLists.txt
trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt
trunk/Scribus/scribus/third_party/prc/CMakeLists.txt
trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
trunk/Scribus/scribus/ui/qml/CMakeLists.txt
trunk/Scribus/scribus/unicodemap/CMakeLists.txt
Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt (original)
+++ trunk/Scribus/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -5,915 +5,917 @@
#Require 2.8.9 for Qt5
#Require 3.1.0 for Qt 5.7 C++ 11 easy support
#Require 3.2.0 for add_custom_target with byproducts
-CMAKE_MINIMUM_REQUIRED(VERSION 3.2.0 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.2.0 FATAL_ERROR)
# Configure CCache if available and wanted
-IF (WANT_CCACHE)
- FIND_PROGRAM(CCACHE_FOUND ccache)
+if (WANT_CCACHE)
+ find_program(CCACHE_FOUND ccache)
if(CCACHE_FOUND)
- MESSAGE(STATUS "Enabling ccache")
- SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
- SET_PROPERTY(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
- ENDIF(CCACHE_FOUND)
-ENDIF (WANT_CCACHE)
+ message(STATUS "Enabling ccache")
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache)
+ set_property(GLOBAL PROPERTY RULE_LAUNCH_LINK ccache)
+ endif()
+endif()
#Pretty colors
-SET(CMAKE_COLOR_MAKEFILE ON)
+set(CMAKE_COLOR_MAKEFILE ON)
#Don't force verbose
-SET(CMAKE_VERBOSE_MAKEFILE OFF)
+set(CMAKE_VERBOSE_MAKEFILE OFF)
#Include current dir
-SET(CMAKE_INCLUDE_CURRENT_DIR TRUE)
+set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
#Don't allow in source builds
-#SET(CMAKE_DISABLE_SOURCE_CHANGES ON)
-#SET(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
+#set(CMAKE_DISABLE_SOURCE_CHANGES ON)
+#set(CMAKE_DISABLE_IN_SOURCE_BUILD ON)
#RPATH setup - more below too
-IF (WANT_NORPATH OR WANT_DISTROBUILD)
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
-ELSE (WANT_NORPATH OR WANT_DISTROBUILD)
- SET(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-ENDIF (WANT_NORPATH OR WANT_DISTROBUILD)
-SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
-SET(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
-SET(CMAKE_SKIP_BUILD_RPATH TRUE)
-
-INCLUDE(CheckIncludeFile)
-INCLUDE(CheckCCompilerFlag)
-INCLUDE(CheckCXXCompilerFlag)
-INCLUDE(CheckTypeSize)
-INCLUDE(TestBigEndian)
-INCLUDE(GNUInstallDirs)
-#INCLUDE(FeatureSummary)
-
-#ENABLE_TESTING()
+if (WANT_NORPATH OR WANT_DISTROBUILD)
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+else()
+ set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+endif()
+set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+set(CMAKE_SKIP_RULE_DEPENDENCY TRUE)
+set(CMAKE_SKIP_BUILD_RPATH TRUE)
+
+include(CheckIncludeFile)
+include(CheckCCompilerFlag)
+include(CheckCXXCompilerFlag)
+include(CheckTypeSize)
+include(TestBigEndian)
+include(GNUInstallDirs)
+#include(FeatureSummary)
+
+#enable_testing()
#Set the custom CMake module directory where our include/lib finders are
-SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules")
##############################################################################################################
########## toplevel compiler flags ##########
-MESSAGE(STATUS "Shared Library Flags: ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
+message(STATUS "Shared Library Flags: ${CMAKE_SHARED_LIBRARY_C_FLAGS}")
#Project Setup
-PROJECT(scribus)
+project(scribus)
#Set our version values
#Final version is ${VERSION} = ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_SUFFIX}
#where VERSION_SUFFIX is of the form "", "svn" or "Nsvn" (N being the minor patch level)
-SET (VERSION_MAJOR "1")
-SET (VERSION_MINOR "5")
-SET (VERSION_PATCH "3")
-SET (VERSION_SUFFIX "svn")
-SET (VERSION ${VERSION_MAJOR})
-IF (VERSION_MINOR GREATER -1)
- SET (VERSION ${VERSION}.${VERSION_MINOR})
-ENDIF (VERSION_MINOR GREATER -1)
-IF (VERSION_PATCH GREATER -1)
- SET (VERSION ${VERSION}.${VERSION_PATCH})
-ENDIF (VERSION_PATCH GREATER -1)
-IF (VERSION_SUFFIX)
- SET (VERSION ${VERSION}.${VERSION_SUFFIX})
-ENDIF (VERSION_SUFFIX)
-MESSAGE(STATUS "Scribus ${VERSION} will be built and installed into ${CMAKE_INSTALL_PREFIX}")
+set (VERSION_MAJOR "1")
+set (VERSION_MINOR "5")
+set (VERSION_PATCH "3")
+set (VERSION_SUFFIX "svn")
+set (VERSION ${VERSION_MAJOR})
+if (VERSION_MINOR GREATER -1)
+ set (VERSION ${VERSION}.${VERSION_MINOR})
+endif()
+if (VERSION_PATCH GREATER -1)
+ set (VERSION ${VERSION}.${VERSION_PATCH})
+endif()
+if (VERSION_SUFFIX)
+ set (VERSION ${VERSION}.${VERSION_SUFFIX})
+endif()
+message(STATUS "Scribus ${VERSION} will be built and installed into ${CMAKE_INSTALL_PREFIX}")
#Set the permissions to be used when installing plugins
-SET(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE)
+set(PLUGIN_PERMISSIONS WORLD_EXECUTE GROUP_EXECUTE OWNER_EXECUTE WORLD_READ GROUP_READ OWNER_READ OWNER_WRITE)
#Our main directory is scribus
-SET(MAIN_DIR_NAME "scribus")
+set(MAIN_DIR_NAME "scribus")
##############################################################################################################
########## check for the CPU we build for ##########
-EXECUTE_PROCESS(
+execute_process(
COMMAND ${CMAKE_C_COMPILER} -dumpmachine
OUTPUT_VARIABLE MACHINE
OUTPUT_STRIP_TRAILING_WHITESPACE
)
## Find out what machine/cpu we are running on
-MESSAGE(STATUS "Machine: ${MACHINE}, void pointer size: ${CMAKE_SIZEOF_VOID_P}")
-STRING(REGEX MATCH "(i[0-9]86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}")
-IF (_machine_x86)
- MESSAGE(STATUS "Found target X86")
- SET(ARCH_X86 1)
-ENDIF (_machine_x86)
-
-STRING(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}")
-IF (_machine_x86_64)
- MESSAGE(STATUS "Found target X86_64")
- SET(ARCH_X86_64 1)
-ENDIF (_machine_x86_64)
-
-STRING(REGEX MATCH "(sparc64-*)|(SPARC64-*)" _machine_sparc_64 "${MACHINE}")
-IF (_machine_sparc_64)
- MESSAGE(STATUS "Found target SPARC 64")
- SET(ARCH_SPARC_64 1)
-ENDIF (_machine_sparc_64)
-
-STRING(REGEX MATCH "(mips64-*)|(MIPS64-*)" _machine_mips_64 "${MACHINE}")
-IF (_machine_mips_64)
- MESSAGE(STATUS "Found target MIPS 64")
- SET(ARCH_MIPS_64 1)
-ENDIF (_machine_mips_64)
-
-STRING(REGEX MATCH "(ppc-*)|(powerpc-*)" _machine_ppc "${MACHINE}")
-IF (_machine_ppc)
- MESSAGE(STATUS "Found target PPC")
- SET(ARCH_PPC 1)
-ENDIF (_machine_ppc)
-
-STRING(REGEX MATCH "(ppc64-*)|(PPC64-*)|(powerpc64-*)" _machine_ppc_64 "${MACHINE}")
-IF (_machine_ppc_64)
- MESSAGE(STATUS "Found target PPC64")
- SET(ARCH_PPC_64 1)
-ENDIF (_machine_ppc_64)
-
-STRING(REGEX MATCH "(sparc-*)" _machine_sparc "${MACHINE}")
-IF (_machine_sparc)
- MESSAGE(STATUS "Found target Sparc")
- SET(ARCH_SPARC 1)
-ENDIF (_machine_sparc)
-
-STRING(REGEX MATCH "(sparcv9-*)" _machine_sparcv9 "${MACHINE}")
-IF (_machine_sparcv9)
- MESSAGE(STATUS "Found target Sparc v9")
- SET(ARCH_SPARCV9 1)
-ENDIF (_machine_sparcv9)
-
-STRING(REGEX MATCH "(sparc64-*)" _machine_sparc64 "${MACHINE}")
-IF (_machine_sparc64)
- MESSAGE(STATUS "Found target Sparc64")
- SET(ARCH_SPARC64 1)
- SET(ARCH64BIT 1)
-ENDIF (_machine_sparc64)
-
-STRING(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
-IF (_machine_hppa)
- MESSAGE(STATUS "Found target Hppa")
- SET(ARCH_HPPA 1)
-ENDIF (_machine_hppa)
+message(STATUS "Machine: ${MACHINE}, void pointer size: ${CMAKE_SIZEOF_VOID_P}")
+string(REGEX MATCH "(i[0-9]86-*)|(athlon-*)|(pentium-*)" _machine_x86 "${MACHINE}")
+if (_machine_x86)
+ message(STATUS "Found target X86")
+ set(ARCH_X86 1)
+endif()
+
+string(REGEX MATCH "(x86_64-*)|(X86_64-*)|(AMD64-*)|(amd64-*)" _machine_x86_64 "${MACHINE}")
+if (_machine_x86_64)
+ message(STATUS "Found target X86_64")
+ set(ARCH_X86_64 1)
+endif()
+
+string(REGEX MATCH "(sparc64-*)|(SPARC64-*)" _machine_sparc_64 "${MACHINE}")
+if (_machine_sparc_64)
+ message(STATUS "Found target SPARC 64")
+ set(ARCH_SPARC_64 1)
+endif()
+
+string(REGEX MATCH "(mips64-*)|(MIPS64-*)" _machine_mips_64 "${MACHINE}")
+if (_machine_mips_64)
+ message(STATUS "Found target MIPS 64")
+ set(ARCH_MIPS_64 1)
+endif()
+
+string(REGEX MATCH "(ppc-*)|(powerpc-*)" _machine_ppc "${MACHINE}")
+if (_machine_ppc)
+ message(STATUS "Found target PPC")
+ set(ARCH_PPC 1)
+endif()
+
+string(REGEX MATCH "(ppc64-*)|(PPC64-*)|(powerpc64-*)" _machine_ppc_64 "${MACHINE}")
+if (_machine_ppc_64)
+ message(STATUS "Found target PPC64")
+ set(ARCH_PPC_64 1)
+endif()
+
+string(REGEX MATCH "(sparc-*)" _machine_sparc "${MACHINE}")
+if (_machine_sparc)
+ message(STATUS "Found target Sparc")
+ set(ARCH_SPARC 1)
+endif()
+
+string(REGEX MATCH "(sparcv9-*)" _machine_sparcv9 "${MACHINE}")
+if (_machine_sparcv9)
+ message(STATUS "Found target Sparc v9")
+ set(ARCH_SPARCV9 1)
+endif()
+
+string(REGEX MATCH "(sparc64-*)" _machine_sparc64 "${MACHINE}")
+if (_machine_sparc64)
+ message(STATUS "Found target Sparc64")
+ set(ARCH_SPARC64 1)
+ set(ARCH64BIT 1)
+endif()
+
+string(REGEX MATCH "(hppa*)" _machine_hppa "${MACHINE}")
+if (_machine_hppa)
+ message(STATUS "Found target Hppa")
+ set(ARCH_HPPA 1)
+endif()
# We need to pass -fPIC to lib2geom on amd64, mips, mipsel, and hppa. See:
# http://www.gentoo.org/proj/en/base/amd64/howtos/index.xml?part=1&chap=3 and
# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=559133
-IF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
- SET(CMAKE_CXX_FLAGS_FPIC "-fPIC")
-ENDIF (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+if (ARCH_X86_64 EQUAL 1 OR ARCH_HPPA EQUAL 1 OR ARCH_MIPS EQUAL 1 OR ARCH_MIPS_64 EQUAL 1 OR ARCH_PPC_64 EQUAL 1)
+ set(CMAKE_CXX_FLAGS_FPIC "-fPIC")
+endif()
## Do our Apple OSX version setup
-IF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
- STRING(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
- IF (_apple_ver EQUAL "16")
- MESSAGE(STATUS "Found macOS Sierra Target: Apple, 64 bit, X86")
- SET(APPLE_10_12_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "16")
- IF (_apple_ver EQUAL "15")
- MESSAGE(STATUS "Found OSX El Capitan Target: Apple, 64 bit, X86")
- SET(APPLE_10_11_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "15")
- IF (_apple_ver EQUAL "14")
- MESSAGE(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
- SET(APPLE_10_10_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "14")
- IF (_apple_ver EQUAL "13")
- MESSAGE(STATUS "Found OSX Mavericks Target: Apple, 64 bit, X86")
- SET(APPLE_10_9_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "13")
- IF (_apple_ver EQUAL "12")
- MESSAGE(STATUS "Found OSX Mountain Lion Target: Apple, 64 bit, X86")
- SET(APPLE_10_8_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "12")
- IF (_apple_ver EQUAL "11")
- MESSAGE(STATUS "Found OSX Lion Target: Apple, 64 bit, X86")
- SET(APPLE_10_7_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "11")
- IF (_apple_ver EQUAL "10")
- MESSAGE(STATUS "Found OSX Snow Leopard Target: Apple, 64 bit, X86")
- SET(APPLE_10_6_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "10")
- IF (_apple_ver EQUAL "9")
- MESSAGE(STATUS "Found OSX Leopard Target: Apple, 32 bit, X86")
- SET(APPLE_10_5_X 1 CACHE TYPE BOOL)
- ENDIF (_apple_ver EQUAL "9")
- UNSET(ARCH_X86)
-ENDIF (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
+if (APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (ARCH_X86 EQUAL 1 OR ARCH_X86_64 EQUAL 1))
+ string(REGEX REPLACE ".*-darwin([0-9]+).*" "\\1" _apple_ver "${MACHINE}")
+ if (_apple_ver EQUAL "16")
+ message(STATUS "Found macOS Sierra Target: Apple, 64 bit, X86")
+ set(APPLE_10_12_X 1 CACHE TYPE BOOL)
+ endif()
+ if (_apple_ver EQUAL "15")
+ message(STATUS "Found OSX El Capitan Target: Apple, 64 bit, X86")
+ set(APPLE_10_11_X 1 CACHE TYPE BOOL)
+ endif()
+ if (_apple_ver EQUAL "14")
+ message(STATUS "Found OSX Yosemite Target: Apple, 64 bit, X86")
+ set(APPLE_10_10_X 1 CACHE TYPE BOOL)
+ endif()
+ if (_apple_ver EQUAL "13")
+ message(STATUS "Found OSX Mavericks Target: Apple, 64 bit, X86")
+ set(APPLE_10_9_X 1 CACHE TYPE BOOL)
+ endif()
+ if (_apple_ver EQUAL "12")
+ message(STATUS "Found OSX Mountain Lion Target: Apple, 64 bit, X86")
+ set(APPLE_10_8_X 1 CACHE TYPE BOOL)
+ endif()
+ if (_apple_ver EQUAL "11")
+ message(STATUS "Found OSX Lion Target: Apple, 64 bit, X86")
+ set(APPLE_10_7_X 1 CACHE TYPE BOOL)
+ endif()
+ if (_apple_ver EQUAL "10")
+ message(STATUS "Found OSX Snow Leopard Target: Apple, 64 bit, X86")
+ set(APPLE_10_6_X 1 CACHE TYPE BOOL)
+ endif()
+ if (_apple_ver EQUAL "9")
+ message(STATUS "Found OSX Leopard Target: Apple, 32 bit, X86")
+ set(APPLE_10_5_X 1 CACHE TYPE BOOL)
+ endif()
+ unset(ARCH_X86)
+endif()
#convert any 64 bit build into generic 64 tag for below
-IF (ARCH_X86_64 OR ARCH_SPARC_64 OR ARCH_MIPS_64 OR ARCH_PPC_64)
- SET(ARCH64BIT 1)
-ENDIF (ARCH_X86_64 OR ARCH_SPARC_64 OR ARCH_MIPS_64 OR ARCH_PPC_64)
-
-MESSAGE(STATUS "Building for target ${MACHINE}")
+if (ARCH_X86_64 OR ARCH_SPARC_64 OR ARCH_MIPS_64 OR ARCH_PPC_64)
+ set(ARCH64BIT 1)
+endif()
+
+message(STATUS "Building for target ${MACHINE}")
##############################################################################################################
########## Versioning Setup ##########
#On Apple, we ignore the versioning tag so all items are "scribus" not "scribus-version"
-IF (NOT BUILD_OSX_BUNDLE)
- SET(BUILD_OSX_BUNDLE ${APPLE} CACHE TYPE BOOL)
-ENDIF (NOT BUILD_OSX_BUNDLE)
+if (NOT BUILD_OSX_BUNDLE)
+ set(BUILD_OSX_BUNDLE ${APPLE} CACHE TYPE BOOL)
+endif()
#Simplify future conditionals for Apple
-IF (APPLE AND BUILD_OSX_BUNDLE)
- SET(APPLEBUNDLE TRUE CACHE TYPE BOOL)
-ENDIF (APPLE AND BUILD_OSX_BUNDLE)
+if (APPLE AND BUILD_OSX_BUNDLE)
+ set(APPLEBUNDLE TRUE CACHE TYPE BOOL)
+endif()
#Announce we cached a version request before, overridden below for OSX
-IF(TAG_VERSION)
- IF (NOT APPLEBUNDLE)
- MESSAGE(STATUS "Previously selected version tag: ${TAG_VERSION}")
- ENDIF (NOT APPLEBUNDLE)
- SET(WANT_VERSIONING 1)
- SET(CACHED_VERSIONING 1)
-ENDIF(TAG_VERSION)
+if(TAG_VERSION)
+ if (NOT APPLEBUNDLE)
+ message(STATUS "Previously selected version tag: ${TAG_VERSION}")
+ endif()
+ set(WANT_VERSIONING 1)
+ set(CACHED_VERSIONING 1)
+endif()
#Remove version tags on OSX so our bundle is Scribus.app
-IF (APPLEBUNDLE OR WIN32)
- IF (WANT_VERSIONING OR CACHED_VERSIONING)
- MESSAGE(STATUS "Ignoring version tag on Win32 or OSX when building bundle")
- SET(WANT_VERSIONING 0)
- SET(CACHED_VERSIONING 0)
- ENDIF (WANT_VERSIONING OR CACHED_VERSIONING)
-ENDIF (APPLEBUNDLE OR WIN32)
+if (APPLEBUNDLE OR WIN32)
+ if (WANT_VERSIONING OR CACHED_VERSIONING)
+ message(STATUS "Ignoring version tag on Win32 or OSX when building bundle")
+ set(WANT_VERSIONING 0)
+ set(CACHED_VERSIONING 0)
+ endif()
+endif()
#Store our version string if required
-IF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
- IF (NOT CUSTOM_VERSIONTAG)
- SET(TAG_VERSION "-${VERSION}" CACHE TYPE STRING)
- ELSE (NOT CUSTOM_VERSIONTAG)
- SET(TAG_VERSION ${CUSTOM_VERSIONTAG} CACHE TYPE STRING)
- ENDIF (NOT CUSTOM_VERSIONTAG)
-ENDIF (WANT_VERSIONING AND NOT CACHED_VERSIONING)
+if (WANT_VERSIONING AND NOT CACHED_VERSIONING)
+ if (NOT CUSTOM_VERSIONTAG)
+ set(TAG_VERSION "-${VERSION}" CACHE TYPE STRING)
+ else()
+ set(TAG_VERSION ${CUSTOM_VERSIONTAG} CACHE TYPE STRING)
+ endif()
+endif()
##############################################################################################################
########## Install/Directory Setup ##########
-IF (APPLEBUNDLE)
-SET (APPLE_APP_DIR "${CMAKE_INSTALL_PREFIX}")
- IF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
+if (APPLEBUNDLE)
+set (APPLE_APP_DIR "${CMAKE_INSTALL_PREFIX}")
+ if ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
# all ok
- ELSE ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
- IF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/?$")
+ else()
+ if ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/?$")
# add "/Contents" subpath
- SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Contents")
- ELSE ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/?$")
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Contents")
+ else()
# no bundle name spcified, use appname and version
- SET(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Scribus${VERSION}.app/Contents")
- ENDIF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/?$")
- ENDIF ("${CMAKE_INSTALL_PREFIX}" MATCHES "[.]app/Contents/?$")
- MESSAGE(STATUS "APPLEBUNDLE install prefix: ${APPLE_APP_DIR}")
-ENDIF (APPLEBUNDLE)
+ set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/Scribus${VERSION}.app/Contents")
+ endif()
+ endif()
+ message(STATUS "APPLEBUNDLE install prefix: ${APPLE_APP_DIR}")
+endif()
#Setup all the directories we will use
-CMAKE_POLICY(SET CMP0005 OLD)
+cmake_policy(SET CMP0005 OLD)
#SHARE
-IF(WANT_VERSIONING)
- SET(SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/")
-ELSE(WANT_VERSIONING)
- SET(SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}/")
-ENDIF(WANT_VERSIONING)
-IF(NOT IS_ABSOLUTE ${SHAREDIR})
- ADD_DEFINITIONS("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DSHAREDIR=\\\"${SHAREDIR}\\\"")
-ENDIF()
+if(WANT_VERSIONING)
+ set(SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/")
+else()
+ set(SHAREDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}/")
+endif()
+if(NOT IS_ABSOLUTE ${SHAREDIR})
+ add_definitions("-DSHAREDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SHAREDIR}\\\"")
+else()
+ add_definitions("-DSHAREDIR=\\\"${SHAREDIR}\\\"")
+endif()
#SHARE - use the default on Apple as TAG_VERSION is empty
-IF(WIN32 OR OS2)
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
-ELSE (WIN32 OR OS2)
- IF(TAG_VERSION OR BUILD_OSX_BUNDLE)
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
- ELSE(TAG_VERSION OR BUILD_OSX_BUNDLE)
- IF(NOT WANT_VERSIONING)
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
- ELSE(NOT WANT_VERSIONING)
- SET(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
- ENDIF(NOT WANT_VERSIONING)
- ENDIF (TAG_VERSION OR BUILD_OSX_BUNDLE)
-ENDIF (WIN32 OR OS2)
-IF(NOT IS_ABSOLUTE ${DOCDIR})
- ADD_DEFINITIONS("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DDOCDIR=\\\"${DOCDIR}\\\"")
-ENDIF()
+if(WIN32 OR OS2)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/")
+else()
+ if(TAG_VERSION OR BUILD_OSX_BUNDLE)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}${TAG_VERSION}/")
+ else()
+ if(NOT WANT_VERSIONING)
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}/")
+ else()
+ set(DOCDIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${MAIN_DIR_NAME}-${VERSION}/")
+ endif()
+ endif()
+endif()
+if(NOT IS_ABSOLUTE ${DOCDIR})
+ add_definitions("-DDOCDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DOCDIR}\\\"")
+else()
+ add_definitions("-DDOCDIR=\\\"${DOCDIR}\\\"")
+endif()
#ICONS
-IF(WIN32)
- SET(ICONDIR "${CMAKE_INSTALL_DATAROOTDIR}/icons/")
-ELSE(WIN32)
- SET(ICONDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/icons/")
-ENDIF(WIN32)
-IF(NOT IS_ABSOLUTE ${ICONDIR})
- ADD_DEFINITIONS("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DICONDIR=\\\"${ICONDIR}\\\"")
-ENDIF()
+if(WIN32)
+ set(ICONDIR "${CMAKE_INSTALL_DATAROOTDIR}/icons/")
+else()
+ set(ICONDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/icons/")
+endif()
+if(NOT IS_ABSOLUTE ${ICONDIR})
+ add_definitions("-DICONDIR=\\\"${CMAKE_INSTALL_PREFIX}/${ICONDIR}\\\"")
+else()
+ add_definitions("-DICONDIR=\\\"${ICONDIR}\\\"")
+endif()
#SAMPLES
-SET(SAMPLESDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/samples/")
-IF(NOT IS_ABSOLUTE ${SAMPLESDIR})
- ADD_DEFINITIONS("-DSAMPLESDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SAMPLESDIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DSAMPLESDIR=\\\"${SAMPLESDIR}\\\"")
-ENDIF()
+set(SAMPLESDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/samples/")
+if(NOT IS_ABSOLUTE ${SAMPLESDIR})
+ add_definitions("-DSAMPLESDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SAMPLESDIR}\\\"")
+else()
+ add_definitions("-DSAMPLESDIR=\\\"${SAMPLESDIR}\\\"")
+endif()
#SCRIPTS
-SET(SCRIPTSDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/scripts/")
-IF(NOT IS_ABSOLUTE ${SCRIPTSDIR})
- ADD_DEFINITIONS("-DSCRIPTSDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SCRIPTSDIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DSCRIPTSDIR=\\\"${SCRIPTSDIR}\\\"")
-ENDIF()
+set(SCRIPTSDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/scripts/")
+if(NOT IS_ABSOLUTE ${SCRIPTSDIR})
+ add_definitions("-DSCRIPTSDIR=\\\"${CMAKE_INSTALL_PREFIX}/${SCRIPTSDIR}\\\"")
+else()
+ add_definitions("-DSCRIPTSDIR=\\\"${SCRIPTSDIR}\\\"")
+endif()
#TEMPLATES
-IF(WIN32)
- SET(TEMPLATEDIR "${CMAKE_INSTALL_DATAROOTDIR}/templates/")
-ELSE(WIN32)
- SET(TEMPLATEDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/templates/")
-ENDIF(WIN32)
-IF(NOT IS_ABSOLUTE ${TEMPLATEDIR})
- ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DTEMPLATEDIR=\\\"${TEMPLATEDIR}\\\"")
-ENDIF()
+if(WIN32)
+ set(TEMPLATEDIR "${CMAKE_INSTALL_DATAROOTDIR}/templates/")
+else()
+ set(TEMPLATEDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/templates/")
+endif()
+if(NOT IS_ABSOLUTE ${TEMPLATEDIR})
+ add_definitions("-DTEMPLATEDIR=\\\"${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR}\\\"")
+else()
+ add_definitions("-DTEMPLATEDIR=\\\"${TEMPLATEDIR}\\\"")
+endif()
#QML
-IF(WIN32)
- SET(QMLDIR "${CMAKE_INSTALL_DATAROOTDIR}/qml/")
-ELSE(WIN32)
- SET(QMLDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/qml/")
-ENDIF(WIN32)
-ADD_DEFINITIONS("-DQMLDIR=\\\"${CMAKE_INSTALL_PREFIX}/${QMLDIR}\\\"")
+if(WIN32)
+ set(QMLDIR "${CMAKE_INSTALL_DATAROOTDIR}/qml/")
+else()
+ set(QMLDIR "${CMAKE_INSTALL_DATAROOTDIR}/${MAIN_DIR_NAME}${TAG_VERSION}/qml/")
+endif()
+add_definitions("-DQMLDIR=\\\"${CMAKE_INSTALL_PREFIX}/${QMLDIR}\\\"")
#DESKTOP
-SET(DESKTOPDIR "${CMAKE_INSTALL_DATAROOTDIR}/applications/")
-IF(NOT IS_ABSOLUTE ${DESKTOPDIR})
- ADD_DEFINITIONS("-DDESKTOPDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DESKTOPDIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DDESKTOPDIR=\\\"${DESKTOPDIR}\\\"")
-ENDIF()
+set(DESKTOPDIR "${CMAKE_INSTALL_DATAROOTDIR}/applications/")
+if(NOT IS_ABSOLUTE ${DESKTOPDIR})
+ add_definitions("-DDESKTOPDIR=\\\"${CMAKE_INSTALL_PREFIX}/${DESKTOPDIR}\\\"")
+else()
+ add_definitions("-DDESKTOPDIR=\\\"${DESKTOPDIR}\\\"")
+endif()
#APPDATA
-SET(APPDATADIR "${CMAKE_INSTALL_DATAROOTDIR}/metainfo/")
-IF(NOT IS_ABSOLUTE ${APPDATADIRR})
- ADD_DEFINITIONS("-DAPPDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/${APPDATADIR}\\\"")
-ELSE()
- ADD_DEFINITIONS("-DAPPDATADIR=\\\"${APPDATADIR}\\\"")
-ENDIF()
+set(APPDATADIR "${CMAKE_INSTALL_DATAROOTDIR}/metainfo/")
+if(NOT IS_ABSOLUTE ${APPDATADIRR})
+ add_definitions("-DAPPDATADIR=\\\"${CMAKE_INSTALL_PREFIX}/${APPDATADIR}\\\"")
+else()
+ add_definitions("-DAPPDATADIR=\\\"${APPDATADIR}\\\"")
+endif()
# APPLICATION_DATA_DIR
# It allows specify the user configuration directory in the compile time.
# Example: I want to use special ~/.scribus135svn config directory for my trunk
# cmake -DAPPLICATION_DATA_DIR=.scribus135svn ...
-IF (APPLICATION_DATA_DIR)
- MESSAGE(STATUS "Using ApplicationDataDir ${APPLICATION_DATA_DIR} instead of the platform default.")
- ADD_DEFINITIONS("-DAPPLICATION_DATA_DIR=\\\"${APPLICATION_DATA_DIR}\\\"")
-ELSE (APPLICATION_DATA_DIR)
- MESSAGE(STATUS "Using standard ApplicationDataDir. You can change it with -DAPPLICATION_DATA_DIR")
-ENDIF (APPLICATION_DATA_DIR)
-
-IF (APPLICATION_CONFIG_DIR)
- MESSAGE(STATUS "Using ApplicationConfigDir ${APPLICATION_CONFIG_DIR} instead of the platform default.")
- ADD_DEFINITIONS("-DAPPLICATION_CONFIG_DIR=\\\"${APPLICATION_CONFIG_DIR}\\\"")
-ELSE (APPLICATION_CONFIG_DIR)
- MESSAGE(STATUS "Using standard ApplicationConfigDir. You can change it with -DAPPLICATION_CONFIG_DIR")
-ENDIF (APPLICATION_CONFIG_DIR)
+if (APPLICATION_DATA_DIR)
+ message(STATUS "Using ApplicationDataDir ${APPLICATION_DATA_DIR} instead of the platform default.")
+ add_definitions("-DAPPLICATION_DATA_DIR=\\\"${APPLICATION_DATA_DIR}\\\"")
+else()
+ message(STATUS "Using standard ApplicationDataDir. You can change it with -DAPPLICATION_DATA_DIR")
+endif()
+
+if (APPLICATION_CONFIG_DIR)
+ message(STATUS "Using ApplicationConfigDir ${APPLICATION_CONFIG_DIR} instead of the platform default.")
+ add_definitions("-DAPPLICATION_CONFIG_DIR=\\\"${APPLICATION_CONFIG_DIR}\\\"")
+else()
+ message(STATUS "Using standard ApplicationConfigDir. You can change it with -DAPPLICATION_CONFIG_DIR")
+endif()
#LIB LOCATION - lib or lib64 normally
#LIB
-IF(WANT_LIB64)
- IF(NOT ARCH_X86_64)
- MESSAGE(STATUS "WARNING: BUILDING 64 Bit build on non 64 bit architecture")
- ENDIF(NOT ARCH_X86_64)
- SET(LIB_SUFFIX "64" CACHE TYPE STRING)
-ENDIF(WANT_LIB64)
-SET(LIB_DIR_NAME "lib${LIB_SUFFIX}")
-IF (APPLEBUNDLE)
- SET(LIBDIR "lib/")
-ELSE (APPLEBUNDLE)
- SET(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
-ENDIF (APPLEBUNDLE)
-ADD_DEFINITIONS("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
+if(WANT_LIB64)
+ if(NOT ARCH_X86_64)
+ message(STATUS "WARNING: BUILDING 64 Bit build on non 64 bit architecture")
+ endif()
+ set(LIB_SUFFIX "64" CACHE TYPE STRING)
+endif()
+set(LIB_DIR_NAME "lib${LIB_SUFFIX}")
+if (APPLEBUNDLE)
+ set(LIBDIR "lib/")
+else()
+ set(LIBDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/")
+endif()
+add_definitions("-DLIBDIR=\\\"${CMAKE_INSTALL_PREFIX}/${LIBDIR}\\\"")
#PLUGINS
-IF(WIN32)
- SET(PLUGINDIR "plugins")
-ELSE(WIN32)
- IF (APPLEBUNDLE)
- SET(PLUGINDIR "${LIBDIR}")
- ELSE (APPLEBUNDLE)
- SET(PLUGINDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/")
- ENDIF (APPLEBUNDLE)
-ENDIF(WIN32)
-ADD_DEFINITIONS("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"")
+if(WIN32)
+ set(PLUGINDIR "plugins")
+else()
+ if (APPLEBUNDLE)
+ set(PLUGINDIR "${LIBDIR}")
+ else()
+ set(PLUGINDIR "${LIB_DIR_NAME}/${MAIN_DIR_NAME}${TAG_VERSION}/plugins/")
+ endif()
+endif()
+add_definitions("-DPLUGINDIR=\\\"${CMAKE_INSTALL_PREFIX}/${PLUGINDIR}\\\"")
#INCLUDE
-SET(INCLUDEDIR "include/${MAIN_DIR_NAME}${TAG_VERSION}/")
+set(INCLUDEDIR "include/${MAIN_DIR_NAME}${TAG_VERSION}/")
#NO ADD DEFINITIONS, WE ONLY INSTALL WITH IT
#RPATH
-IF (WANT_NORPATH OR WANT_DISTROBUILD)
+if (WANT_NORPATH OR WANT_DISTROBUILD)
set(CMAKE_INSTALL_RPATH "")
-ELSE (WANT_NORPATH OR WANT_DISTROBUILD)
+else()
set(CMAKE_INSTALL_RPATH ${PLUGINDIR})
-ENDIF (WANT_NORPATH OR WANT_DISTROBUILD)
+endif()
# Set the XDG mime stuff
-SET(MIMEDIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/")
+set(MIMEDIR "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages/")
##############################################################################################################
########## Build Setup ##########
#Convert our simpler command line option to the CMake style
#None, Debug, Release, .. or custom ones
-# SET(WANT_DEBUG 1)
-IF(WANT_DEBUG)
- SET(CMAKE_BUILD_TYPE Debug)
-ENDIF(WANT_DEBUG)
-IF (WANT_RELEASEWITHDEBUG)
- SET(CMAKE_BUILD_TYPE RelWithDebInfo)
-ENDIF (WANT_RELEASEWITHDEBUG)
-IF(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
- SET(CMAKE_BUILD_TYPE RELEASE)
-ENDIF(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
+# set(WANT_DEBUG 1)
+if(WANT_DEBUG)
+ set(CMAKE_BUILD_TYPE Debug)
+endif()
+if (WANT_RELEASEWITHDEBUG)
+ set(CMAKE_BUILD_TYPE RelWithDebInfo)
+endif()
+if(NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
+ set(CMAKE_BUILD_TYPE RELEASE)
+endif()
#Based on our build type, setup our build options
-IF(APPLE)
- IF(APPLE_10_12_X)
- SET(OSXMINVER "10.12" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- IF(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk"))
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk")
- ELSEIF(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"))
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
- ENDIF()
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_12_X)
- IF(APPLE_10_11_X)
- SET(OSXMINVER "10.11" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_11_X)
- IF(APPLE_10_10_X)
- SET(OSXMINVER "10.10" CACHE TYPE STRING)
- SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
- IF (WANT_OSX_SDK)
- IF(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"))
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk")
- ELSEIF(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"))
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
- ENDIF()
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_10_X)
- IF(APPLE_10_9_X)
- SET(OSXMINVER "10.9" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_9_X)
- IF(APPLE_10_8_X)
- SET(OSXMINVER "10.8" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_8_X)
- IF(APPLE_10_7_X)
- SET(OSXMINVER "10.7" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_7_X)
- IF(APPLE_10_6_X)
- SET(OSXMINVER "10.6" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_6_X)
- IF(APPLE_10_5_X)
- SET(OSXMINVER "10.5" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk")
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_5_X)
- IF(APPLE_10_4_X)
- SET(OSXMINVER "10.4" CACHE TYPE STRING)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
- ENDIF (WANT_OSX_SDK)
- ENDIF(APPLE_10_4_X)
+if(APPLE)
+ if(APPLE_10_12_X)
+ set(OSXMINVER "10.12" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk"))
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.12.sdk")
+ elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"))
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
+ endif()
+ endif()
+ endif()
+ if(APPLE_10_11_X)
+ set(OSXMINVER "10.11" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
+ endif()
+ endif()
+ if(APPLE_10_10_X)
+ set(OSXMINVER "10.10" CACHE TYPE STRING)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.10")
+ if (WANT_OSX_SDK)
+ if(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk"))
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk")
+ elseif(EXISTS("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk"))
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk")
+ endif()
+ endif()
+ endif()
+ if(APPLE_10_9_X)
+ set(OSXMINVER "10.9" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk")
+ endif()
+ endif()
+ if(APPLE_10_8_X)
+ set(OSXMINVER "10.8" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk")
+ endif()
+ endif()
+ if(APPLE_10_7_X)
+ set(OSXMINVER "10.7" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_SYSROOT "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk")
+ endif()
+ endif()
+ if(APPLE_10_6_X)
+ set(OSXMINVER "10.6" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_SYSROOT "/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk")
+ endif()
+ endif()
+ if(APPLE_10_5_X)
+ set(OSXMINVER "10.5" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.5.sdk")
+ endif()
+ endif()
+ if(APPLE_10_4_X)
+ set(OSXMINVER "10.4" CACHE TYPE STRING)
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX10.4u.sdk")
+ endif()
+ endif()
# gcc/mac
- IF(WANT_UNIVERSAL_BUNDLE)
- MESSAGE("Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
- SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
- SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
- ENDIF (WANT_OSX_SDK)
- ELSE(WANT_UNIVERSAL_BUNDLE)
- IF(ARCH_PPC OR ARCH_PPC_64)
- MESSAGE("Setting PPC Architecture for OSX Build/Bundle")
- SET(CMAKE_OSX_ARCHITECTURES "ppc" )
- SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc" )
- ELSE(ARCH_PPC OR ARCH_PPC_64)
- IF (WANT_OSX_SDK)
- SET(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
- ENDIF (WANT_OSX_SDK)
- IF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X)
- MESSAGE("Setting x86_64 Architecture for OSX Build/Bundle")
- SET(CMAKE_OSX_ARCHITECTURES "x86_64" )
- SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
- ELSE(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X)
- MESSAGE("Setting i386 Architecture for OSX Build/Bundle")
- SET(CMAKE_OSX_ARCHITECTURES "i386" )
- SET(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
- ENDIF(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X)
- ENDIF(ARCH_PPC OR ARCH_PPC_64)
- ENDIF(WANT_UNIVERSAL_BUNDLE)
- MESSAGE(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")
- SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSXMINVER} )
- SET(ENV{LD_PREBIND} 1 )
- SET(ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
- IF (WANT_DEBUG)
- SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
- SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
- ENDIF (WANT_DEBUG)
- IF (WANT_RELEASEWITHDEBUG)
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
- SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
- ENDIF (WANT_RELEASEWITHDEBUG)
- IF (NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
- SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
- SET(CMAKE_C_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
- ENDIF (NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
-ELSE(APPLE)
- IF(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
+ if(WANT_UNIVERSAL_BUNDLE)
+ message("Setting Universal (PPC/i386) Architecture for OSX Build/Bundle")
+ set(CMAKE_OSX_ARCHITECTURES "ppc;i386" )
+ set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc;i386" )
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.4")
+ endif()
+ else()
+ if(ARCH_PPC OR ARCH_PPC_64)
+ message("Setting PPC Architecture for OSX Build/Bundle")
+ set(CMAKE_OSX_ARCHITECTURES "ppc" )
+ set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "ppc" )
+ else()
+ if (WANT_OSX_SDK)
+ set(CMAKE_OSX_DEPLOYMENT_TARGET "${OSXMINVER}")
+ endif()
+ if(APPLE_10_6_X OR APPLE_10_7_X OR APPLE_10_8_X OR APPLE_10_9_X OR APPLE_10_10_X OR APPLE_10_11_X OR APPLE_10_12_X)
+ message("Setting x86_64 Architecture for OSX Build/Bundle")
+ set(CMAKE_OSX_ARCHITECTURES "x86_64" )
+ set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "x86_64" )
+ else()
+ message("Setting i386 Architecture for OSX Build/Bundle")
+ set(CMAKE_OSX_ARCHITECTURES "i386" )
+ set(CMAKE_TRY_COMPILE_OSX_ARCHITECTURES "i386" )
+ endif()
+ endif()
+ endif()
+ message(STATUS "${CMAKE_OSX_ARCHITECTURES} ${CMAKE_OSX_SYSROOT}")
+ set(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSXMINVER} )
+ set(ENV{LD_PREBIND} 1 )
+ set(ENV{LD_PREBIND_ALLOW_OVERLAP} 1 )
+ if (WANT_DEBUG)
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_C_FLAGS_DEBUG "-O0 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ endif()
+ if (WANT_RELEASEWITHDEBUG)
+ set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O2 -g -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ endif()
+ if (NOT WANT_DEBUG AND NOT WANT_RELEASEWITHDEBUG)
+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ set(CMAKE_C_FLAGS_RELEASE "-O2 -fno-inline-functions -Wall -mmacosx-version-min=${OSXMINVER}")
+ endif()
+else()
+ if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
# Windows build with Visual Studio
# Surely there's a better way to identify the compiler?
- SET(CMAKE_CXX_FLAGS_DEBUG)
- SET(CMAKE_C_FLAGS_DEBUG)
- ELSE(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
+ set(CMAKE_CXX_FLAGS_DEBUG)
+ set(CMAKE_C_FLAGS_DEBUG)
+ else()
# vanilla gcc
- SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -fstrict-aliasing")
- SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall -fstrict-aliasing")
- IF (_machine_x86 OR _machine_x86_64)
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
- SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fPIC")
- ENDIF (_machine_x86 OR _machine_x86_64)
- ENDIF(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
-ENDIF(APPLE)
-
-IF(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
- SET(CMAKE_CXX_FLAGS_RELEASE)
- SET(CMAKE_C_FLAGS_RELEASE)
-ELSE(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
- SET(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -fPIC")
- SET(CMAKE_C_FLAGS_RELEASE "-O2 -Wall -fPIC")
-# ADD_DEFINITIONS(-DNDEBUG)
-ENDIF(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
-
-IF(WIN32)
- ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN
+ set(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -Wall -fstrict-aliasing")
+ set(CMAKE_C_FLAGS_DEBUG "-O0 -g -Wall -fstrict-aliasing")
+ if (_machine_x86 OR _machine_x86_64)
+ set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fPIC")
+ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fPIC")
+ endif()
+ endif()
+endif()
+
+if(${CMAKE_GENERATOR} MATCHES "^(Visual Studio|NMake).*")
+ set(CMAKE_CXX_FLAGS_RELEASE)
+ set(CMAKE_C_FLAGS_RELEASE)
+else()
+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -Wall -fPIC")
+ set(CMAKE_C_FLAGS_RELEASE "-O2 -Wall -fPIC")
+# add_definitions(-DNDEBUG)
+endif()
+
+if(WIN32)
+ add_definitions(-DWIN32_LEAN_AND_MEAN
-DAVOID_WIN32_FILEIO
-D_CRT_SECURE_NO_DEPRECATE
-D_USE_MATH_DEFINES
-DCOMPILE_PLUGIN_AS_DLL
)
- SET(BUILD_WINDOWS_VERSION 1)
- SET(DLL_USE_NATIVE_API 1)
-ENDIF(WIN32)
+ set(BUILD_WINDOWS_VERSION 1)
+ set(DLL_USE_NATIVE_API 1)
+endif()
##############################################################################################################
########## Find Dependencies ##########
#<< Qt
-SET (QT_MIN_VERSION "5.5.0")
-SET(CMAKE_PREFIX_PATH "${QT_PREFIX}/lib/cmake")
-SET(CMAKE_INCLUDE_CURRENT_DIR ON)
-FIND_PACKAGE(Qt5Core REQUIRED)
-IF(Qt5Core_FOUND)
- MESSAGE(STATUS "----- USE QT 5-----")
-ELSE(Qt5Core_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No QT 5 found")
-ENDIF(Qt5Core_FOUND)
-FIND_PACKAGE(Qt5Widgets REQUIRED)
-IF(Qt5Widgets_FOUND)
- MESSAGE(STATUS "----- USE QT Widgets-----")
-ELSE(Qt5Widgets_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No QT Widgets found")
-ENDIF(Qt5Widgets_FOUND)
-FIND_PACKAGE(Qt5Gui REQUIRED)
-IF(Qt5Gui_FOUND)
- MESSAGE(STATUS "----- USE Qt5Gui -----")
-ELSE(Qt5Gui_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: Qt5Gui found")
-ENDIF(Qt5Gui_FOUND)
-FIND_PACKAGE(Qt5Xml REQUIRED)
-IF(Qt5Xml_FOUND)
- MESSAGE(STATUS "----- USE QT 5 XML -----")
-ELSE(Qt5Xml_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No QT 5 XML found")
-ENDIF(Qt5Xml_FOUND)
-FIND_PACKAGE(Qt5Network REQUIRED)
-IF(Qt5Network_FOUND)
- MESSAGE(STATUS "----- USE Qt5Network -----")
-ELSE(Qt5Network_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No Qt5Network found")
-ENDIF(Qt5Network_FOUND)
-FIND_PACKAGE(Qt5OpenGL REQUIRED)
-IF(Qt5OpenGL_FOUND)
- MESSAGE(STATUS "----- USE Qt5OpenGL -----")
-ELSE(Qt5OpenGL_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No Qt5OpenGL found")
-ENDIF(Qt5OpenGL_FOUND)
-FIND_PACKAGE(Qt5LinguistTools REQUIRED)
-IF(Qt5LinguistTools_FOUND)
- MESSAGE(STATUS "----- USE Qt5LinguistTools -----")
-ELSE(Qt5LinguistTools_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
-ENDIF(Qt5LinguistTools_FOUND)
-FIND_PACKAGE(Qt5Quick REQUIRED)
-IF(Qt5Quick_FOUND)
- MESSAGE(STATUS "----- USE Qt5Quick -----")
-ELSE(Qt5Quick_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No Qt5Quick found")
-ENDIF(Qt5Quick_FOUND)
-FIND_PACKAGE(Qt5PrintSupport REQUIRED)
-IF(Qt5PrintSupport_FOUND)
- MESSAGE(STATUS "----- USE Qt5PrintSupport -----")
-ELSE(Qt5PrintSupport_FOUND)
- MESSAGE(FATAL_ERROR "ERROR: No Qt5PrintSupport found")
-ENDIF(Qt5PrintSupport_FOUND)
-INCLUDE_DIRECTORIES(${Qt5Core_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5Core_DEFINITIONS})
-INCLUDE_DIRECTORIES(${Qt5Widgets_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5Widgets_DEFINITIONS})
-INCLUDE_DIRECTORIES(${Qt5Gui_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5Gui_DEFINITIONS})
-INCLUDE_DIRECTORIES(${Qt5Xml_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5Xml_DEFINITIONS})
-INCLUDE_DIRECTORIES(${Qt5Network_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5Network_DEFINITIONS})
-INCLUDE_DIRECTORIES(${Qt5OpenGL_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5OpenGL_DEFINITIONS})
-INCLUDE_DIRECTORIES(${Qt5Quick_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5Quick_DEFINITIONS})
-INCLUDE_DIRECTORIES(${Qt5PrintSupport_INCLUDE_DIRS})
-ADD_DEFINITIONS(${Qt5PrintSupport_DEFINITIONS})
-
-MESSAGE(STATUS "Qt VERSION: ${Qt5Widgets_VERSION}")
-IF (NOT WANT_CPP11 AND Qt5Widgets_VERSION_MAJOR EQUAL 5 AND Qt5Widgets_VERSION_MINOR GREATER 6)
- MESSAGE(STATUS "Your Qt version is 5.7.0 or superior, enabling C++11 compiler features")
- SET(WANT_CPP11 1)
-ENDIF (NOT WANT_CPP11 AND Qt5Widgets_VERSION_MAJOR EQUAL 5 AND Qt5Widgets_VERSION_MINOR GREATER 6)
+set (QT_MIN_VERSION "5.5.0")
+set(CMAKE_PREFIX_PATH "${QT_PREFIX}/lib/cmake")
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(Qt5Core REQUIRED)
+if(Qt5Core_FOUND)
+ message(STATUS "----- USE QT 5-----")
+else()
+ message(FATAL_ERROR "ERROR: No QT 5 found")
+endif()
+find_package(Qt5Widgets REQUIRED)
+if(Qt5Widgets_FOUND)
+ message(STATUS "----- USE QT Widgets-----")
+else()
+ message(FATAL_ERROR "ERROR: No QT Widgets found")
+endif()
+find_package(Qt5Gui REQUIRED)
+if(Qt5Gui_FOUND)
+ message(STATUS "----- USE Qt5Gui -----")
+else()
+ message(FATAL_ERROR "ERROR: Qt5Gui found")
+endif()
+find_package(Qt5Xml REQUIRED)
+if(Qt5Xml_FOUND)
+ message(STATUS "----- USE QT 5 XML -----")
+else()
+ message(FATAL_ERROR "ERROR: No QT 5 XML found")
+endif()
+find_package(Qt5Network REQUIRED)
+if(Qt5Network_FOUND)
+ message(STATUS "----- USE Qt5Network -----")
+else()
+ message(FATAL_ERROR "ERROR: No Qt5Network found")
+endif()
+find_package(Qt5OpenGL REQUIRED)
+if(Qt5OpenGL_FOUND)
+ message(STATUS "----- USE Qt5OpenGL -----")
+else()
+ message(FATAL_ERROR "ERROR: No Qt5OpenGL found")
+endif()
+find_package(Qt5LinguistTools REQUIRED)
+if(Qt5LinguistTools_FOUND)
+ message(STATUS "----- USE Qt5LinguistTools -----")
+else()
+ message(FATAL_ERROR "ERROR: No Qt5LinguistTools found")
+endif()
+find_package(Qt5Quick REQUIRED)
+if(Qt5Quick_FOUND)
+ message(STATUS "----- USE Qt5Quick -----")
+else()
+ message(FATAL_ERROR "ERROR: No Qt5Quick found")
+endif()
+find_package(Qt5PrintSupport REQUIRED)
+if(Qt5PrintSupport_FOUND)
+ message(STATUS "----- USE Qt5PrintSupport -----")
+else()
+ message(FATAL_ERROR "ERROR: No Qt5PrintSupport found")
+endif()
+include_directories(${Qt5Core_INCLUDE_DIRS})
+add_definitions(${Qt5Core_DEFINITIONS})
+include_directories(${Qt5Widgets_INCLUDE_DIRS})
+add_definitions(${Qt5Widgets_DEFINITIONS})
+include_directories(${Qt5Gui_INCLUDE_DIRS})
+add_definitions(${Qt5Gui_DEFINITIONS})
+include_directories(${Qt5Xml_INCLUDE_DIRS})
+add_definitions(${Qt5Xml_DEFINITIONS})
+include_directories(${Qt5Network_INCLUDE_DIRS})
+add_definitions(${Qt5Network_DEFINITIONS})
+include_directories(${Qt5OpenGL_INCLUDE_DIRS})
+add_definitions(${Qt5OpenGL_DEFINITIONS})
+include_directories(${Qt5Quick_INCLUDE_DIRS})
+add_definitions(${Qt5Quick_DEFINITIONS})
+include_directories(${Qt5PrintSupport_INCLUDE_DIRS})
+add_definitions(${Qt5PrintSupport_DEFINITIONS})
+
+message(STATUS "Qt VERSION: ${Qt5Widgets_VERSION}")
+if (NOT WANT_CPP11 AND Qt5Widgets_VERSION_MAJOR EQUAL 5 AND Qt5Widgets_VERSION_MINOR GREATER 6)
+ message(STATUS "Your Qt version is 5.7.0 or superior, enabling C++11 compiler features")
+ set(WANT_CPP11 1)
+endif()
#>> Qt
#C++11 Support
-IF(WANT_CPP11)
- MESSAGE(STATUS "Enabling C++11 compiler features")
+if(WANT_CPP11)
+ message(STATUS "Enabling C++11 compiler features")
set(CMAKE_CXX_STANDARD 11)
-ENDIF(WANT_CPP11)
+endif()
#<< ZLIB, PNG
-IF (WIN32)
+if (WIN32)
# On win32 we can use Qt's zlib and libpng, so we use some
# custom cmake includes. This permits us to honour the
# USE_QT_ZLIB_PNGLIB flag if passed.
- SET(PNG_DIR ${CMAKE_MODULE_PATH})
- SET(ZLIB_DIR ${CMAKE_MODULE_PATH})
-ENDIF (WIN32)
-FIND_PACKAGE(ZLIB REQUIRED)
-IF (ZLIB_FOUND)
- MESSAGE("ZLIB Library Found OK")
- SET(HAVE_LIBZ 1)
-ENDIF(ZLIB_FOUND)
-#FIND_PACKAGE(PNG REQUIRED)
-#IF (PNG_FOUND)
-# MESSAGE("PNG Library Found OK")
-#ENDIF(PNG_FOUND)
+ set(PNG_DIR ${CMAKE_MODULE_PATH})
+ set(ZLIB_DIR ${CMAKE_MODULE_PATH})
+endif()
+find_package(ZLIB REQUIRED)
+if (ZLIB_FOUND)
+ message("ZLIB Library Found OK")
+ set(HAVE_LIBZ 1)
+endif()
+#find_package(PNG REQUIRED)
+#if (PNG_FOUND)
+# message("PNG Library Found OK")
+#endif()
#>> ZLIB, PNG
-IF (WANT_NOOSG)
- MESSAGE("Building without 3D Extension")
-ELSE (WANT_NOOSG)
- FIND_PACKAGE(OSG)
- IF(OSG_FOUND)
- MESSAGE("OSG found OK")
- SET(HAVE_OSG 1)
- FIND_PACKAGE(OpenGL)
- ELSE(OSG_FOUND)
- MESSAGE("No OSG found, building without 3D Extension")
- ENDIF(OSG_FOUND)
-ENDIF (WANT_NOOSG)
+if (WANT_NOOSG)
+ message("Building without 3D Extension")
+else()
+ find_package(OSG)
+ if(OSG_FOUND)
+ message("OSG found OK")
+ set(HAVE_OSG 1)
+ find_package(OpenGL)
+ else()
+ message("No OSG found, building without 3D Extension")
+ endif()
+endif()
#<< JPEG, TIFF
-FIND_PACKAGE(JPEG REQUIRED)
-IF (JPEG_FOUND)
- MESSAGE("JPEG Library Found OK")
-ENDIF(JPEG_FOUND)
-FIND_PACKAGE(TIFF REQUIRED)
-IF (TIFF_FOUND)
- MESSAGE("TIFF Library Found OK")
- SET(HAVE_TIFF 1)
-ELSE(TIFF_FOUND)
- MESSAGE(FATAL_ERROR "Could not find the TIFF Library")
-ENDIF(TIFF_FOUND)
+find_package(JPEG REQUIRED)
+if (JPEG_FOUND)
+ message("JPEG Library Found OK")
+endif()
+find_package(TIFF REQUIRED)
+if (TIFF_FOUND)
+ message("TIFF Library Found OK")
+ set(HAVE_TIFF 1)
+else()
+ message(FATAL_ERROR "Could not find the TIFF Library")
+endif()
#<< JPEG, TIFF
#<< PYTHON
-#SET(PythonLibs_FIND_VERSION 2)
-FIND_PACKAGE(PythonLibs 2 REQUIRED)
-IF (PYTHON_LIBRARY)
- MESSAGE("Python Library Found OK")
- SET(HAVE_PYTHON 1)
- SET(COMPILE_PYTHON 1)
-ENDIF(PYTHON_LIBRARY)
+#set(PythonLibs_FIND_VERSION 2)
+find_package(PythonLibs 2 REQUIRED)
+if (PYTHON_LIBRARY)
+ message("Python Library Found OK")
+ set(HAVE_PYTHON 1)
+ set(COMPILE_PYTHON 1)
+endif()
#>> PYTHON
#<< FreeType2
-FIND_PACKAGE(Freetype REQUIRED)
-IF (FREETYPE_FOUND)
- MESSAGE(STATUS "FreeType2 Library Found OK")
- INCLUDE(CheckLibraryExists)
+find_package(Freetype REQUIRED)
+if (FREETYPE_FOUND)
+ message(STATUS "FreeType2 Library Found OK")
+ include(CheckLibraryExists)
CHECK_LIBRARY_EXISTS(${FREETYPE_LIBRARY} FT_Get_First_Char "" HAVE_FREETYPE_FIRST)
CHECK_LIBRARY_EXISTS(${FREETYPE_LIBRARY} FT_Get_Next_Char "" HAVE_FREETYPE_NEXT)
# here we have an alternative
# a) Setup CFLAGS with the FREETYPE_INCLUDE_DIR_freetype2 provided by cmake
# b) Insert ${FREETYPE_INCLUDE_DIRS} in include sections of CMakeLists that need it
# I prefer (b) and at some point & from my opinion it should be just needed in scribus/fonts/CmakeLists.txt - pm
-ELSE (FREETYPE_FOUND)
- MESSAGE(FATAL_ERROR "No Freetype Found")
-ENDIF(FREETYPE_FOUND)
+else()
+ message(FATAL_ERROR "No Freetype Found")
+endif()
#>> FreeType2
#<<Render Library
-IF (WANT_PRIVATE_CAIRO)
- MESSAGE("We no longer support the private cairo library as the latest public release is more up to date, setting WANT_SYSTEM_CAIRO=1")
-ENDIF(WANT_PRIVATE_CAIRO)
-
-IF (RENDER_LIB)
- IF (RENDER_LIB STREQUAL "QTARTHUR")
- MESSAGE("Qt4's Arthur as renderer is not supported anymore, performing renderer detection again")
- ENDIF (RENDER_LIB STREQUAL "QTARTHUR")
-ENDIF(RENDER_LIB)
-
-SET(CAIRO_DIR ${CMAKE_MODULE_PATH})
-FIND_PACKAGE(CAIRO REQUIRED)
-IF(CAIRO_FOUND)
- MESSAGE("CAIRO Library Found OK")
- SET(RENDER_LIB "CAIRO_SYSTEM" CACHE TYPE STRING)
-ELSE(CAIRO_FOUND)
- MESSAGE(FATAL_ERROR "No Cairo Found")
-ENDIF(CAIRO_FOUND)
+if (WANT_PRIVATE_CAIRO)
+ message("We no longer support the private cairo library as the latest public release is more up to date, setting WANT_SYSTEM_CAIRO=1")
+endif()
+
+if (RENDER_LIB)
+ if (RENDER_LIB STREQUAL "QTARTHUR")
+ message("Qt4's Arthur as renderer is not supported anymore, performing renderer detection again")
+ endif()
+endif()
+
+set(CAIRO_DIR ${CMAKE_MODULE_PATH})
+find_package(CAIRO REQUIRED)
+if(CAIRO_FOUND)
+ message("CAIRO Library Found OK")
+ set(RENDER_LIB "CAIRO_SYSTEM" CACHE TYPE STRING)
+else()
+ message(FATAL_ERROR "No Cairo Found")
+endif()
#>>Render Library
#<<CUPS
-IF(NOT WIN32 AND NOT HAIKU)
- FIND_PACKAGE(Cups REQUIRED)
- IF(CUPS_FOUND)
- SET(HAVE_CUPS 1)
- MESSAGE("CUPS Library Found OK")
- ENDIF(CUPS_FOUND)
-ELSE(NOT WIN32 AND NOT HAIKU)
+if(NOT WIN32 AND NOT HAIKU)
+ find_package(Cups REQUIRED)
+ if(CUPS_FOUND)
+ set(HAVE_CUPS 1)
+ message("CUPS Library Found OK")
+ endif()
+else()
# Windows doesn't use CUPS
- SET(CUPS_INCLUDE_DIR)
-ENDIF(NOT WIN32 AND NOT HAIKU)
+ set(CUPS_INCLUDE_DIR)
+endif()
#>>CUPS
#<<LibXML2
-FIND_PACKAGE(LibXml2 REQUIRED)
-IF(LIBXML2_FOUND)
- SET(HAVE_XML 1)
- MESSAGE("LIBXML2 Library Found OK")
-ENDIF(LIBXML2_FOUND)
+find_package(LibXml2 REQUIRED)
+if(LIBXML2_FOUND)
+ set(HAVE_XML 1)
+ message("LIBXML2 Library Found OK")
+endif()
#>>LibXML2
#<<LittleCMS
-SET(LCMS_DIR ${CMAKE_MODULE_PATH})
-FIND_PACKAGE(LCMS2 REQUIRED)
-IF(LCMS2_FOUND)
- SET(HAVE_LCMS2 1)
- SET(HAVE_CMS 1)
- SET(CMS_INC "\"lcms2.h\"")
- MESSAGE("LittleCMS-2 Library Found OK")
-ELSE(LCMS2_FOUND)
- MESSAGE(FATAL_ERROR "Could not find the LittleCMS 2 Library")
-ENDIF(LCMS2_FOUND)
+set(LCMS_DIR ${CMAKE_MODULE_PATH})
+find_package(LCMS2 REQUIRED)
+if(LCMS2_FOUND)
+ set(HAVE_LCMS2 1)
+ set(HAVE_CMS 1)
+ set(CMS_INC "\"lcms2.h\"")
+ message("LittleCMS-2 Library Found OK")
+else()
+ message(FATAL_ERROR "Could not find the LittleCMS 2 Library")
+endif()
#>>LittleCMS
#<<FontConfig
-IF(NOT WIN32)
- SET(FONTCONFIG_DIR ${CMAKE_MODULE_PATH})
- FIND_PACKAGE(FONTCONFIG)
- IF(FONTCONFIG_FOUND)
- MESSAGE("FontConfig Found OK")
- SET(HAVE_FONTCONFIG 1)
- ENDIF(FONTCONFIG_FOUND)
-ELSE(NOT WIN32)
+if(NOT WIN32)
+ set(FONTCONFIG_DIR ${CMAKE_MODULE_PATH})
+ find_package(FONTCONFIG)
+ if(FONTCONFIG_FOUND)
+ message("FontConfig Found OK")
+ set(HAVE_FONTCONFIG 1)
+ endif()
+else()
# Windows builds neither use nor require fontconfig
- SET(FONTCONFIG_INCLUDE_DIR)
-ENDIF(NOT WIN32)
+ set(FONTCONFIG_INCLUDE_DIR)
+endif()
#>>FontConfig
#<<HUNSPELL for Speelling support
-OPTION(WANT_HUNSPELL "Enable support for spell checking with hunspell" ON)
-IF (WANT_HUNSPELL)
- FIND_PACKAGE(HUNSPELL)
- IF (HUNSPELL_FOUND)
- MESSAGE("Hunspell Found OK")
- SET(HAVE_HUNSPELL 1)
- ELSE (HUNSPELL_FOUND)
- MESSAGE("Hunspell or its developer libraries NOT found - Disabling support for spell checking")
- ENDIF (HUNSPELL_FOUND)
-ENDIF (WANT_HUNSPELL)
+option(WANT_HUNSPELL "Enable support for spell checking with hunspell" ON)
+if (WANT_HUNSPELL)
+ find_package(HUNSPELL)
+ if (HUNSPELL_FOUND)
+ message("Hunspell Found OK")
+ set(HAVE_HUNSPELL 1)
+ else()
+ message("Hunspell or its developer libraries NOT found - Disabling support for spell checking")
+ endif()
+endif()
#>>HUNSPELL for Speelling support
#<<PoDoFo for AI PDF import
-OPTION(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
-IF (WITH_PODOFO)
- FIND_PACKAGE(LIBPODOFO)
- IF (LIBPODOFO_FOUND)
- MESSAGE("PoDoFo found OK")
- SET(HAVE_PODOFO 1)
- ELSE (LIBPODOFO_FOUND)
- MESSAGE("PoDoFo NOT found - Disabling support for PDF embedded in AI")
- ENDIF (LIBPODOFO_FOUND)
-ENDIF (WITH_PODOFO)
+option(WITH_PODOFO "Enable support for PDF embedded in AI" ON)
+if (WITH_PODOFO)
+ find_package(LIBPODOFO)
+ if (LIBPODOFO_FOUND)
+ message("PoDoFo found OK")
+ set(HAVE_PODOFO 1)
+ else()
+ message("PoDoFo NOT found - Disabling support for PDF embedded in AI")
+ endif()
+endif()
#>>PoDoFo for AI PDF import
#<<Boost for 2Geom Tools
-OPTION(WITH_BOOST "Enable support for Boost based enhancements" ON)
-IF (WITH_BOOST)
- FIND_PACKAGE(Boost)
- IF (Boost_FOUND)
- MESSAGE("Boost Library Found OK")
- SET(HAVE_BOOST 1)
- ELSE(Boost_FOUND)
- MESSAGE("Boost: NOT FOUND, not building 2geomtools")
- ENDIF (Boost_FOUND)
-ENDIF (WITH_BOOST)
+option(WITH_BOOST "Enable support for Boost based enhancements" ON)
+if (WITH_BOOST)
+ find_package(Boost)
+ if (Boost_FOUND)
+ message("Boost Library Found OK")
+ set(HAVE_BOOST 1)
+ else()
+ message("Boost: NOT FOUND, not building 2geomtools")
+ endif()
+endif()
#>>Boost for 2Geom Tools
#<<GraphicksMagick for image import
-IF (WANT_GRAPHICSMAGICK)
- SET(GMAGICK_DIR ${CMAKE_MODULE_PATH})
+if (WANT_GRAPHICSMAGICK)
+ set(GMAGICK_DIR ${CMAKE_MODULE_PATH})
pkg_check_modules(GMAGICK GraphicsMagick)
- # FIND_PACKAGE(GMAGICK)
- IF(GMAGICK_FOUND)
- MESSAGE("GraphicksMagick Found OK")
- ELSE(GMAGICK_FOUND)
- MESSAGE("GraphicksMagick NOT found! Building without additional image format support!")
- ENDIF(GMAGICK_FOUND)
-ELSE (WANT_GRAPHICSMAGICK)
- MESSAGE("Building without GraphicksMagick (use -DWANT_GRAPHICSMAGICK=1 to enable)")
-ENDIF (WANT_GRAPHICSMAGICK)
+ # find_package(GMAGICK)
+ if(GMAGICK_FOUND)
+ message("GraphicksMagick Found OK")
+ else()
+ message("GraphicksMagick NOT found! Building without additional image format support!")
+ endif()
+else()
+ message("Building without GraphicksMagick (use -DWANT_GRAPHICSMAGICK=1 to enable)")
+endif()
#>>GraphicksMagick for image import
#<<Poppler for PDF import
-FIND_PACKAGE(POPPLER REQUIRED)
-IF (POPPLER_FOUND)
- IF (FREETYPE_FOUND)
- SET( HAVE_POPPLER 1 )
- MESSAGE(STATUS "Found poppler")
- MESSAGE(STATUS "Found poppler libs: ${POPPLER_LIBRARY}")
- MESSAGE(STATUS "Found poppler includes: ${POPPLER_INCLUDE_DIR}")
- ELSE (FREETYPE_FOUND)
- MESSAGE("Poppler NOT found - Disabling support for native PDF import")
- ENDIF (FREETYPE_FOUND)
-ELSE (POPPLER_FOUND)
- MESSAGE("Poppler NOT found - Disabling support for native PDF import")
-ENDIF (POPPLER_FOUND)
+find_package(POPPLER REQUIRED)
+if (POPPLER_FOUND)
+ if (FREETYPE_FOUND)
+ set( HAVE_POPPLER 1 )
+ message(STATUS "Found poppler")
+ message(STATUS "Found poppler libs: ${POPPLER_LIBRARY}")
+ message(STATUS "Found poppler includes: ${POPPLER_INCLUDE_DIR}")
+ else()
+ message("Poppler NOT found - Disabling support for native PDF import")
+ endif()
+else()
+ message("Poppler NOT found - Disabling support for native PDF import")
+endif()
#>>Poppler for PDF import
# librevenge for MsPub import
pkg_check_modules(LIBREVENGE librevenge-0.0)
-IF (LIBREVENGE_FOUND)
+if (LIBREVENGE_FOUND)
pkg_check_modules(LIBREVENGE_STREAM librevenge-stream-0.0)
- IF (LIBREVENGE_STREAM_FOUND)
+ if (LIBREVENGE_STREAM_FOUND)
pkg_check_modules(LIBREVENGE_GENERATORS librevenge-generators-0.0)
- IF (LIBREVENGE_GENERATORS_FOUND)
- SET(HAVE_REVENGE 1)
- ENDIF (LIBREVENGE_GENERATORS_FOUND)
- ENDIF (LIBREVENGE_STREAM_FOUND)
-ENDIF (LIBREVENGE_FOUND)
+ if (LIBREVENGE_GENERATORS_FOUND)
+ set(HAVE_REVENGE 1)
+ endif()
+ endif()
+endif()
# CTL support
pkg_check_modules(HARFBUZZ REQUIRED harfbuzz>=0.9.42 harfbuzz-icu)
pkg_check_modules(ICU REQUIRED icu-uc)
-#MESSAGE(STATUS "${HARFBUZZ_INCLUDE_DIRS}")
-#MESSAGE(STATUS "${ICU_INCLUDE_DIRS}")
+#message(STATUS "${HARFBUZZ_INCLUDE_DIRS}")
+#message(STATUS "${ICU_INCLUDE_DIRS}")
+
+#test cmake 3.7 only find_package(ICU REQUIRED icu_uc)
##############################################################################################################
@@ -922,42 +924,42 @@
TEST_BIG_ENDIAN(WORDS_BIGENDIAN)
CHECK_INCLUDE_FILE("dlfcn.h" HAVE_DLFCN_H)
-IF(HAVE_DLFCN_H)
- ADD_DEFINITIONS(-DHAVE_DLFCN_H)
-ENDIF(HAVE_DLFCN_H)
+if(HAVE_DLFCN_H)
+ add_definitions(-DHAVE_DLFCN_H)
+endif()
CHECK_INCLUDE_FILE("unistd.h" HAVE_UNISTD_H)
-IF(HAVE_UNISTD_H)
- ADD_DEFINITIONS(-DHAVE_UNISTD_H)
-ENDIF(HAVE_UNISTD_H)
+if(HAVE_UNISTD_H)
+ add_definitions(-DHAVE_UNISTD_H)
+endif()
CHECK_INCLUDE_FILE("sys/types.h" HAVE_SYS_TYPES_H)
-# IF(HAVE_SYS_TYPES_H)
-# ADD_DEFINITIONS(-DHAVE_SYS_TYPES_H)
-# ENDIF(HAVE_SYS_TYPES_H)
+# if(HAVE_SYS_TYPES_H)
+# add_definitions(-DHAVE_SYS_TYPES_H)
+# endif()
CHECK_INCLUDE_FILE("sys/stat.h" HAVE_SYS_STAT_H)
-# IF(HAVE_SYS_STAT_H)
-# ADD_DEFINITIONS(-DHAVE_SYS_STAT_H)
-# ENDIF(HAVE_SYS_STAT_H)
+# if(HAVE_SYS_STAT_H)
+# add_definitions(-DHAVE_SYS_STAT_H)
+# endif()
#>>Test for existing include files
#Create configure files.. config.h and uninstall
#config.h
-INCLUDE (ConfigureChecks.cmake)
- IF(WIN32)
- SET(CONFIG_NAME win-config.h)
- ELSE(WIN32)
- SET(CONFIG_NAME config.h)
- ENDIF(WIN32)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
-ADD_DEFINITIONS("-DHAVE_CONFIG_H")
+include (ConfigureChecks.cmake)
+ if(WIN32)
+ set(CONFIG_NAME win-config.h)
+ else()
+ set(CONFIG_NAME config.h)
+ endif()
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/${CONFIG_NAME})
+add_definitions("-DHAVE_CONFIG_H")
#Set up include dirs with all found packages
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/scribus
${QT_INCLUDES}
@@ -975,22 +977,22 @@
${ICU_INCLUDE_DIRS}
)
-IF (NOT WIN32 AND NOT HAIKU)
-INCLUDE_DIRECTORIES(
+if (NOT WIN32 AND NOT HAIKU)
+include_directories(
${CUPS_INCLUDE_DIR}
)
-ENDIF (NOT WIN32 AND NOT HAIKU)
+endif()
##############################################################################################################
########## Uninstall Setup ##########
-CONFIGURE_FILE(
+configure_file(
"${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in"
"${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
IMMEDIATE @ONLY
)
-ADD_CUSTOM_TARGET(uninstall
+add_custom_target(uninstall
"${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
)
@@ -999,21 +1001,21 @@
########## Add our subdirs ##########
#Add our source subdirs
-ADD_SUBDIRECTORY(scribus)
-ADD_SUBDIRECTORY(doc)
-ADD_SUBDIRECTORY(resources/dicts)
-ADD_SUBDIRECTORY(resources/editorconfig)
-ADD_SUBDIRECTORY(resources/iconsets)
-ADD_SUBDIRECTORY(resources/keysets)
-ADD_SUBDIRECTORY(resources/loremipsum)
-ADD_SUBDIRECTORY(resources/manpages)
-ADD_SUBDIRECTORY(resources/profiles)
-ADD_SUBDIRECTORY(resources/swatches)
-ADD_SUBDIRECTORY(resources/templates)
-ADD_SUBDIRECTORY(resources/translations)
+add_subdirectory(scribus)
+add_subdirectory(doc)
+add_subdirectory(resources/dicts)
+add_subdirectory(resources/editorconfig)
+add_subdirectory(resources/iconsets)
+add_subdirectory(resources/keysets)
+add_subdirectory(resources/loremipsum)
+add_subdirectory(resources/manpages)
+add_subdirectory(resources/profiles)
+add_subdirectory(resources/swatches)
+add_subdirectory(resources/templates)
+add_subdirectory(resources/translations)
#Install our READMEs etc.
-INSTALL(FILES
+install(FILES
AUTHORS
BUILDING
ChangeLog
@@ -1027,35 +1029,35 @@
DESTINATION ${DOCDIR}
)
-IF (APPLE)
- INSTALL(FILES
+if (APPLE)
+ install(FILES
README.MacOSX
DESTINATION ${DOCDIR}
)
- # EXECUTE_PROCESS (COMMAND mkdir -p "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats")
- # IF (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
- #MESSAGE(STATUS ${QT_PREFIX})
- #MESSAGE(STATUS "@QT_PREFIX@/plugins/imageformats/libqjpeg.dylib")
- #MESSAGE(STATUS "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
- # EXECUTE_PROCESS (COMMAND ditto "@QT_PREFIX@/plugins/imageformats/libqjpeg.dylib" "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
- # ENDIF()
-
-ENDIF (APPLE)
+ # execute_process (COMMAND mkdir -p "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats")
+ # if (NOT EXISTS "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
+ #message(STATUS ${QT_PREFIX})
+ #message(STATUS "@QT_PREFIX@/plugins/imageformats/libqjpeg.dylib")
+ #message(STATUS "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
+ # execute_process (COMMAND ditto "@QT_PREFIX@/plugins/imageformats/libqjpeg.dylib" "${CMAKE_INSTALL_PREFIX}/PlugIns/imageformats/libqjpeg.dylib")
+ # endif()
+
+endif()
#Install the .desktop file
-CONFIGURE_FILE(
+configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/scribus.desktop.in
${CMAKE_CURRENT_SOURCE_DIR}/scribus.desktop
)
-INSTALL(FILES
+install(FILES
scribus.desktop
RENAME scribus${TAG_VERSION}.desktop
DESTINATION ${DESKTOPDIR}
)
#Install our MIME data
-INSTALL(FILES
+install(FILES
scribus.xml
RENAME scribus${TAG_VERSION}.xml
DESTINATION ${MIMEDIR}
@@ -1063,11 +1065,11 @@
#Install the appdata file
-CONFIGURE_FILE(
+configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/scribus.appdata.xml.in
${CMAKE_CURRENT_SOURCE_DIR}/scribus.appdata.xml
)
-INSTALL(FILES
+install(FILES
scribus.appdata.xml
RENAME scribus${TAG_VERSION}.appdata.xml
DESTINATION ${APPDATADIR}
@@ -1075,37 +1077,37 @@
#If building an Apple bundle, install these specific files
-IF(APPLEBUNDLE)
- INSTALL(FILES
+if(APPLEBUNDLE)
+ install(FILES
Scribus.app/Contents/Info.plist
DESTINATION ${CMAKE_INSTALL_PREFIX}
)
- INSTALL(FILES
+ install(FILES
Scribus.app/Contents/Resources/Scribus.icns
Scribus.app/Contents/Resources/Scribus-doc.icns
DESTINATION ${CMAKE_INSTALL_PREFIX}/Resources
)
-ENDIF(APPLEBUNDLE)
+endif()
##############################################################################################################
########## Install/CPack Setup ##########
# If the cmake version includes cpack, use it for tarball building
-IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
- SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Scribus is an open source publishing application for Linux, Mac OSX and Windows")
- SET(CPACK_PACKAGE_VENDOR "Scribus Team")
- SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
- SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README")
- SET(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
- SET(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
- SET(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
- SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Scribus ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
- SET(CPACK_PACKAGE_EXECUTABLES "scribus${TAG_VERSION}")
- SET(CPACK_SOURCE_PACKAGE_FILE_NAME "scribus-${VERSION}${VERSION_SUFFIX}")
- SET(CPACK_SOURCE_GENERATOR TBZ2)
- SET(CPACK_SYSTEM_NAME "")
- SET(CPACK_TOPLEVEL_TAG "")
- SET(CPACK_SOURCE_IGNORE_FILES
+if(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Scribus is an open source publishing application for Linux, Mac OSX and Windows")
+ set(CPACK_PACKAGE_VENDOR "Scribus Team")
+ set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+ set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/README")
+ set(CPACK_PACKAGE_VERSION_MAJOR "${VERSION_MAJOR}")
+ set(CPACK_PACKAGE_VERSION_MINOR "${VERSION_MINOR}")
+ set(CPACK_PACKAGE_VERSION_PATCH "${VERSION_PATCH}")
+ set(CPACK_PACKAGE_INSTALL_DIRECTORY "Scribus ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
+ set(CPACK_PACKAGE_EXECUTABLES "scribus${TAG_VERSION}")
+ set(CPACK_SOURCE_PACKAGE_FILE_NAME "scribus-${VERSION}${VERSION_SUFFIX}")
+ set(CPACK_SOURCE_GENERATOR TBZ2)
+ set(CPACK_SYSTEM_NAME "")
+ set(CPACK_TOPLEVEL_TAG "")
+ set(CPACK_SOURCE_IGNORE_FILES
CMakeCache.txt
scribus-1.5.2.tar.bz2
scribus-1.5.2.tar.Z
@@ -1124,8 +1126,8 @@
"^${PROJECT_SOURCE_DIR}.*/CVSROOT/"
"^${PROJECT_SOURCE_DIR}/admin/"
)
- INCLUDE(CPack)
-ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
+ include(CPack)
+endif()
#include (cmakeconfigreport optional)
Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/CAIROConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/CAIROConfig.cmake (original)
+++ trunk/Scribus/cmake/modules/CAIROConfig.cmake Sun Nov 27 21:37:34 2016
@@ -10,65 +10,65 @@
# CAIRO_CFLAGS, cflags for include information
-IF(PREFIX_CAIRO)
- MESSAGE(STATUS "Searching custom cairo location: ${PREFIX_CAIRO}")
- SET(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
- SET(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
- SET(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
-ELSE(PREFIX_CAIRO)
+if(PREFIX_CAIRO)
+ message(STATUS "Searching custom cairo location: ${PREFIX_CAIRO}")
+ set(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
+ set(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
+ set(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
+else(PREFIX_CAIRO)
# use pkgconfig to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
- INCLUDE(UsePkgConfig)
+ # in the find_path() and find_library() calls
+ if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(UsePkgConfig)
PKGCONFIG(cairo _libCairoIncDir _libCairoLinkDir _libCairoLinkFlags _libCairoCflags)
- SET(PKG_CAIRO_INCLUDE_DIRS ${_libCairoIncDir})
- SET(PKG_CAIRO_LIBRARIES ${_libCairoLinkDir})
- ELSE (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
- INCLUDE(FindPkgConfig)
+ set(PKG_CAIRO_INCLUDE_DIRS ${_libCairoIncDir})
+ set(PKG_CAIRO_LIBRARIES ${_libCairoLinkDir})
+ else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(FindPkgConfig)
pkg_search_module(CAIRO REQUIRED libcairo>=1.14.0 cairo>=1.14.0)
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
-ENDIF(PREFIX_CAIRO)
+ endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+endif(PREFIX_CAIRO)
-FIND_PATH(CAIRO_INCLUDE_DIR
+find_path(CAIRO_INCLUDE_DIR
NAMES cairo.h
PATHS ${PREFIX_CAIRO_INCLUDE} ${PKG_CAIRO_INCLUDE_DIRS} ${CAIRO_INCLUDE_DIRS} /usr/local/include /usr/include
PATH_SUFFIXES cairo
NO_DEFAULT_PATH
)
-FIND_LIBRARY(CAIRO_LIBRARY
+find_library(CAIRO_LIBRARY
NAMES libcairo cairo
PATHS ${PREFIX_CAIRO_LIB} ${PKG_CAIRO_LIBRARIES} ${CAIRO_LIBRARY_DIRS} /usr/local/lib /usr/lib
NO_DEFAULT_PATH
)
#If we had no cairo prefix specify it, set PREFIX_CAIRO_LIB most importantly, for the
-# IF(NOT PREFIX_CAIRO)
-# GET_FILENAME_COMPONENT(CAIRO_DIR ${CAIRO_LIBRARY} PATH)
-# GET_FILENAME_COMPONENT(CAIRO_DIR ${CAIRO_DIR} PATH)
-# SET(PREFIX_CAIRO ${CAIRO_DIR})
-# IF(PREFIX_CAIRO)
-# SET(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
-# SET(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
-# SET(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
-# ENDIF(PREFIX_CAIRO)
-# ENDIF(NOT PREFIX_CAIRO)
+# if(NOT PREFIX_CAIRO)
+# get_filename_component(CAIRO_DIR ${CAIRO_LIBRARY} PATH)
+# get_filename_component(CAIRO_DIR ${CAIRO_DIR} PATH)
+# set(PREFIX_CAIRO ${CAIRO_DIR})
+# if(PREFIX_CAIRO)
+# set(PREFIX_CAIRO_INCLUDE "${PREFIX_CAIRO}/include")
+# set(PREFIX_CAIRO_LIB "${PREFIX_CAIRO}/lib")
+# set(PREFIX_CAIRO_BIN "${PREFIX_CAIRO}/bin")
+# endif(PREFIX_CAIRO)
+# endif(NOT PREFIX_CAIRO)
-SET(CAIRO_FIND_QUIETLY 1)
+set(CAIRO_FIND_QUIETLY 1)
-IF (CAIRO_LIBRARY)
- IF (CAIRO_INCLUDE_DIR)
- SET( CAIRO_FOUND "YES" )
- IF(NOT CAIRO_FIND_QUIETLY)
- MESSAGE(STATUS "Found cairo: ${CAIRO_LIBRARY}")
- ENDIF(NOT CAIRO_FIND_QUIETLY)
- SET( CAIRO_LIBRARIES ${CAIRO_LIBRARY} )
+if (CAIRO_LIBRARY)
+ if (CAIRO_INCLUDE_DIR)
+ set( CAIRO_FOUND "YES" )
+ if(NOT CAIRO_FIND_QUIETLY)
+ message(STATUS "Found cairo: ${CAIRO_LIBRARY}")
+ endif(NOT CAIRO_FIND_QUIETLY)
+ set( CAIRO_LIBRARIES ${CAIRO_LIBRARY} )
# CB: We dont use this yet anyway
-# FIND_PROGRAM(CAIRO_CONFIG
+# find_program(CAIRO_CONFIG
# NAMES pkg-config
# PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin
# )
-# EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--libs cairo" OUTPUT_VARIABLE CAIRO_LIBS)
-# EXEC_PROGRAM(${CAIRO_CONFIG} ARGS "--cflags cairo" OUTPUT_VARIABLE CAIRO_CFLAGS)
- ENDIF (CAIRO_INCLUDE_DIR)
-ENDIF (CAIRO_LIBRARY)
+# exec_program(${CAIRO_CONFIG} ARGS "--libs cairo" OUTPUT_VARIABLE CAIRO_LIBS)
+# exec_program(${CAIRO_CONFIG} ARGS "--cflags cairo" OUTPUT_VARIABLE CAIRO_CFLAGS)
+ endif (CAIRO_INCLUDE_DIR)
+endif (CAIRO_LIBRARY)
Modified: trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake (original)
+++ trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake Sun Nov 27 21:37:34 2016
@@ -9,36 +9,36 @@
# LIBFONTCONFIG_LIBS, link information
# LIBFONTCONFIG_CFLAGS, cflags for include information
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
- INCLUDE(UsePkgConfig)
+if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(UsePkgConfig)
PKGCONFIG(fontconfig _fontconfigIncDir _fontconfigLinkDir _fontconfigLinkFlags _fontconfigCflags)
- SET(FONTCONFIG_LIBS ${_fontconfigCflags})
-ELSE (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
- INCLUDE(FindPkgConfig)
+ set(FONTCONFIG_LIBS ${_fontconfigCflags})
+else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(FindPkgConfig)
pkg_search_module(FONTCONFIG REQUIRED fontconfig)
-ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
-#INCLUDE(UsePkgConfig)
+#include(UsePkgConfig)
# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
+# in the find_path() and find_library() calls
#PKGCONFIG(fontconfig _fontconfigIncDir _fontconfigLinkDir _fontconfigLinkFlags _fontconfigCflags)
-#SET(FONTCONFIG_LIBS ${_fontconfigCflags})
+#set(FONTCONFIG_LIBS ${_fontconfigCflags})
-IF(BUILD_OSX_BUNDLE)
- FIND_PATH(FONTCONFIG_INCLUDE_DIR
+if(BUILD_OSX_BUNDLE)
+ find_path(FONTCONFIG_INCLUDE_DIR
NAMES fontconfig/fontconfig.h
PATHS ${FONTCONFIG_INCLUDE_DIRS} /opt/local/include
NO_DEFAULT_PATH
)
- FIND_LIBRARY(FONTCONFIG_LIBRARY
+ find_library(FONTCONFIG_LIBRARY
NAMES fontconfig
PATHS ${FONTCONFIG_LIBRARY_DIRS} /opt/local/lib
NO_DEFAULT_PATH
)
-ELSE(BUILD_OSX_BUNDLE)
- FIND_PATH(FONTCONFIG_INCLUDE_DIR
+else(BUILD_OSX_BUNDLE)
+ find_path(FONTCONFIG_INCLUDE_DIR
NAMES fontconfig/fontconfig.h
PATHS ${FONTCONFIG_INCLUDE_DIRS}
${_fontconfigIncDir}
@@ -47,25 +47,25 @@
PATH_SUFFIXES fontconfig
)
# quick hack as the above finds it nicely but our source includes the libart_lgpl text at the moment
- #STRING(REGEX REPLACE "/libart_lgpl" "" FONTCONFIG_INCLUDE_DIR ${FONTCONFIG_INCLUDE_DIR})
- FIND_LIBRARY(FONTCONFIG_LIBRARY NAMES fontconfig
+ #string(REGEX REPLACE "/libart_lgpl" "" FONTCONFIG_INCLUDE_DIR ${FONTCONFIG_INCLUDE_DIR})
+ find_library(FONTCONFIG_LIBRARY NAMES fontconfig
PATHS ${FONTCONFIG_LIBRARY_DIRS} /usr/lib /usr/local/lib
)
-ENDIF(BUILD_OSX_BUNDLE)
+endif(BUILD_OSX_BUNDLE)
-# MESSAGE(STATUS "fclib ${FONTCONFIG_LIBRARY}")
-# MESSAGE(STATUS "fcinclude ${FONTCONFIG_INCLUDE_DIR}")
+# message(STATUS "fclib ${FONTCONFIG_LIBRARY}")
+# message(STATUS "fcinclude ${FONTCONFIG_INCLUDE_DIR}")
-IF (FONTCONFIG_LIBRARY)
- IF (FONTCONFIG_INCLUDE_DIR)
- SET( FONTCONFIG_FOUND "YES" )
- SET( FONTCONFIG_LIBRARIES ${FONTCONFIG_LIBRARY} )
- FIND_PROGRAM(FONTCONFIG_CONFIG NAMES fontconfig-config PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin)
-# EXEC_PROGRAM(${FONTCONFIG_CONFIG} ARGS --libs OUTPUT_VARIABLE FONTCONFIG_LIBS)
-# EXEC_PROGRAM(${FONTCONFIG_CONFIG} ARGS --cflags OUTPUT_VARIABLE FONTCONFIG_CFLAGS)
-# MESSAGE(STATUS ${FONTCONFIG_LIBS})
-# MESSAGE(STATUS ${FONTCONFIG_CFLAGS})
- ENDIF (FONTCONFIG_INCLUDE_DIR)
-ENDIF (FONTCONFIG_LIBRARY)
+if (FONTCONFIG_LIBRARY)
+ if (FONTCONFIG_INCLUDE_DIR)
+ set( FONTCONFIG_FOUND "YES" )
+ set( FONTCONFIG_LIBRARIES ${FONTCONFIG_LIBRARY} )
+ find_program(FONTCONFIG_CONFIG NAMES fontconfig-config PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin)
+# exec_program(${FONTCONFIG_CONFIG} ARGS --libs OUTPUT_VARIABLE FONTCONFIG_LIBS)
+# exec_program(${FONTCONFIG_CONFIG} ARGS --cflags OUTPUT_VARIABLE FONTCONFIG_CFLAGS)
+# message(STATUS ${FONTCONFIG_LIBS})
+# message(STATUS ${FONTCONFIG_CFLAGS})
+ endif (FONTCONFIG_INCLUDE_DIR)
+endif (FONTCONFIG_LIBRARY)
Modified: trunk/Scribus/cmake/modules/FREETYPEConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FREETYPEConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FREETYPEConfig.cmake (original)
+++ trunk/Scribus/cmake/modules/FREETYPEConfig.cmake Sun Nov 27 21:37:34 2016
@@ -10,72 +10,72 @@
# also defined, but not for general use are
# FREETYPE_LIBRARY, where to find the FREETYPE library.
-IF (BUILD_OSX_BUNDLE)
- FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
+if (BUILD_OSX_BUNDLE)
+ find_path(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
/opt/local/include/
NO_CMAKE_SYSTEM_PATH
)
-ELSE (BUILD_OSX_BUNDLE)
- FIND_PATH(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
+else (BUILD_OSX_BUNDLE)
+ find_path(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
/usr/include/
/usr/local/include/
NO_CMAKE_SYSTEM_PATH
)
-ENDIF (BUILD_OSX_BUNDLE)
+endif (BUILD_OSX_BUNDLE)
-IF (BUILD_OSX_BUNDLE)
- FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
+if (BUILD_OSX_BUNDLE)
+ find_path(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
/opt/local/include/freetype2
NO_CMAKE_SYSTEM_PATH
)
-ELSE (BUILD_OSX_BUNDLE)
- FIND_PATH(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
+else (BUILD_OSX_BUNDLE)
+ find_path(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
/usr/include/freetype2
/usr/local/include/freetype2
NO_CMAKE_SYSTEM_PATH
)
-ENDIF (BUILD_OSX_BUNDLE)
+endif (BUILD_OSX_BUNDLE)
-SET(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped)
-SET(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype)
+set(FREETYPE_LIBRARY_NAMES_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG} freetyped)
+set(FREETYPE_LIBRARY_NAMES_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} freetype)
-IF(BUILD_OSX_BUNDLE)
- SET(FREETYPE_LIB_PATHS /opt/local/lib)
-ELSE(BUILD_OSX_BUNDLE)
- SET(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib)
-ENDIF(BUILD_OSX_BUNDLE)
+if(BUILD_OSX_BUNDLE)
+ set(FREETYPE_LIB_PATHS /opt/local/lib)
+else(BUILD_OSX_BUNDLE)
+ set(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib)
+endif(BUILD_OSX_BUNDLE)
-FIND_LIBRARY(FREETYPE_LIBRARY_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} ${FREETYPE_LIBRARY_NAMES}
+find_library(FREETYPE_LIBRARY_RELEASE ${FREETYPE_LIBRARY_NAMES_RELEASE} ${FREETYPE_LIBRARY_NAMES}
PATHS
${FREETYPE_LIB_PATHS}
NO_CMAKE_SYSTEM_PATH)
-FIND_LIBRARY(FREETYPE_LIBRARY_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG}
+find_library(FREETYPE_LIBRARY_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG}
PATHS
${FREETYPE_LIB_PATHS}
NO_CMAKE_SYSTEM_PATH)
-INCLUDE(LibraryDebugAndRelease)
+include(LibraryDebugAndRelease)
SET_LIBRARY_FROM_DEBUG_AND_RELEASE(FREETYPE)
-# MESSAGE(STATUS "ft lib ${FREETYPE_LIBRARY}")
-# MESSAGE(STATUS "ft2 build ${FREETYPE_INCLUDE_DIR_FT2BUILD}")
-# MESSAGE(STATUS "ft header ${FREETYPE_INCLUDE_DIR_FTHEADER}")
+# message(STATUS "ft lib ${FREETYPE_LIBRARY}")
+# message(STATUS "ft2 build ${FREETYPE_INCLUDE_DIR_FT2BUILD}")
+# message(STATUS "ft header ${FREETYPE_INCLUDE_DIR_FTHEADER}")
-SET(FREETYPE_FIND_QUIETLY 1)
+set(FREETYPE_FIND_QUIETLY 1)
-IF (FREETYPE_LIBRARY)
- IF (NOT FREETYPE_FIND_QUIETLY)
- MESSAGE(STATUS "Found Freetype2: ${FREETYPE_LIBRARY}")
- ENDIF (NOT FREETYPE_FIND_QUIETLY)
- IF (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
- SET( FREETYPE_FOUND "YES" )
- SET( FREETYPE_INCLUDE_DIR
+if (FREETYPE_LIBRARY)
+ if (NOT FREETYPE_FIND_QUIETLY)
+ message(STATUS "Found Freetype2: ${FREETYPE_LIBRARY}")
+ endif (NOT FREETYPE_FIND_QUIETLY)
+ if (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
+ set( FREETYPE_FOUND "YES" )
+ set( FREETYPE_INCLUDE_DIR
${FREETYPE_INCLUDE_DIR_FT2BUILD}
${FREETYPE_INCLUDE_DIR_FTHEADER} )
- SET( FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} )
- FIND_PROGRAM(FREETYPE_CONFIG NAMES freetype-config PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin)
- EXEC_PROGRAM(${FREETYPE_CONFIG} ARGS --libs OUTPUT_VARIABLE LIBFREETYPE_LIBS)
- EXEC_PROGRAM(${FREETYPE_CONFIG} ARGS --cflags OUTPUT_VARIABLE LIBFREETYPE_CFLAGS)
- ENDIF (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
-ENDIF (FREETYPE_LIBRARY)
+ set( FREETYPE_LIBRARIES ${FREETYPE_LIBRARY} )
+ find_program(FREETYPE_CONFIG NAMES freetype-config PATHS ${prefix}/bin ${exec_prefix}/bin /usr/local/bin /opt/local/bin /usr/bin /usr/nekoware/bin /usr/X11/bin)
+ exec_program(${FREETYPE_CONFIG} ARGS --libs OUTPUT_VARIABLE LIBFREETYPE_LIBS)
+ exec_program(${FREETYPE_CONFIG} ARGS --cflags OUTPUT_VARIABLE LIBFREETYPE_CFLAGS)
+ endif (FREETYPE_INCLUDE_DIR_FTHEADER AND FREETYPE_INCLUDE_DIR_FT2BUILD)
+endif (FREETYPE_LIBRARY)
Modified: trunk/Scribus/cmake/modules/FindGMAGICK.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindGMAGICK.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindGMAGICK.cmake (original)
+++ trunk/Scribus/cmake/modules/FindGMAGICK.cmake Sun Nov 27 21:37:34 2016
@@ -24,13 +24,13 @@
PATHS ${GMAGICK_PKGCONF_LIBRARY_DIRS}
)
-MESSAGE("GRAPHICS_MAGIC debug: pkgconf: ${GMAGICK_PKGCONF_INCLUDE_DIRS},${GMAGICK_PKGCONF_LIBRARY_DIRS} include:${GMAGICK_INCLUDE_DIR} lib:${GMAGICK_LIBRARY}")
-INCLUDE(FindPackageHandleStandardArgs)
+message("GRAPHICS_MAGIC debug: pkgconf: ${GMAGICK_PKGCONF_INCLUDE_DIRS},${GMAGICK_PKGCONF_LIBRARY_DIRS} include:${GMAGICK_INCLUDE_DIR} lib:${GMAGICK_LIBRARY}")
+include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(GMAGICK DEFAULT_MSG GMAGICK_LIBRARY GMAGICK_INCLUDE_DIR)
-IF(GMAGICK_FOUND)
+if(GMAGICK_FOUND)
set(GMAGICK_INCLUDES " ${GMAGICK_INCLUDE_DIR}/GraphicsMagick")
set(GMAGICK_LIBRARIES " ${GMAGICK_LIBRARY}")
-ELSE()
+else()
set(GMAGICK_INCLUDES)
set(GMAGICK_LIBRARIES)
-ENDIF()
+endif()
Modified: trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindHUNSPELL.cmake (original)
+++ trunk/Scribus/cmake/modules/FindHUNSPELL.cmake Sun Nov 27 21:37:34 2016
@@ -8,16 +8,16 @@
#Based on examples at http://www.vtk.org/Wiki/CMake:How_To_Find_Libraries
-FIND_PATH(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-FIND_LIBRARY(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
+find_path(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
+find_library(HUNSPELL_LIBRARIES NAMES hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
-INCLUDE(FindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
# handle the QUIETLY and REQUIRED arguments and set HUNSPELL_FOUND to TRUE
# if all listed variables are TRUE
-#FIND_PACKAGE(HUNSPELL QUIET NO_MODULE HINTS /opt/local/bin/hunspell)
+#find_package(HUNSPELL QUIET NO_MODULE HINTS /opt/local/bin/hunspell)
#FIND_PACKAGE_HANDLE_STANDARD_ARGS(HUNSPELL CONFIG_MODE)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(HUNSPELL DEFAULT_MSG HUNSPELL_LIBRARIES HUNSPELL_INCLUDE_DIR )
-MARK_AS_ADVANCED(HUNSPELL_INCLUDE_DIR HUNSPELL_LIBRARIES)
+mark_as_advanced(HUNSPELL_INCLUDE_DIR HUNSPELL_LIBRARIES)
Modified: trunk/Scribus/cmake/modules/FindHYPHEN.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindHYPHEN.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindHYPHEN.cmake (original)
+++ trunk/Scribus/cmake/modules/FindHYPHEN.cmake Sun Nov 27 21:37:34 2016
@@ -7,23 +7,23 @@
# also defined, but not for general use are
# HYPHEN_LIBRARY, where to find the HYPHEN library.
-FIND_PATH(HYPHEN_INCLUDE_DIR hyphen.h)
+find_path(HYPHEN_INCLUDE_DIR hyphen.h)
-SET(HYPHEN_NAMES_RELEASE ${HYPHEN_NAMES_RELEASE} ${HYPHEN_NAMES} hyphen libhyphen)
-SET(HYPHEN_NAMES_DEBUG ${HYPHEN_NAMES_DEBUG} hyphend libhyphend)
+set(HYPHEN_NAMES_RELEASE ${HYPHEN_NAMES_RELEASE} ${HYPHEN_NAMES} hyphen libhyphen)
+set(HYPHEN_NAMES_DEBUG ${HYPHEN_NAMES_DEBUG} hyphend libhyphend)
-FIND_LIBRARY(HYPHEN_LIBRARY_RELEASE NAMES ${HYPHEN_NAMES_RELEASE} )
-FIND_LIBRARY(HYPHEN_LIBRARY_DEBUG NAMES ${HYPHEN_NAMES_DEBUG} )
+find_library(HYPHEN_LIBRARY_RELEASE NAMES ${HYPHEN_NAMES_RELEASE} )
+find_library(HYPHEN_LIBRARY_DEBUG NAMES ${HYPHEN_NAMES_DEBUG} )
-INCLUDE(LibraryDebugAndRelease)
+include(LibraryDebugAndRelease)
SET_LIBRARY_FROM_DEBUG_AND_RELEASE(HYPHEN)
# handle the QUIETLY and REQUIRED arguments and set HYPHEN_FOUND to TRUE if
# all listed variables are TRUE
-INCLUDE(ScribusFindPackageHandleStandardArgs)
+include(ScribusFindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_LIBRARY HYPHEN_INCLUDE_DIR)
-IF(HYPHEN_FOUND)
- SET( HYPHEN_LIBRARIES ${HYPHEN_LIBRARY} )
-ENDIF(HYPHEN_FOUND)
+if(HYPHEN_FOUND)
+ set( HYPHEN_LIBRARIES ${HYPHEN_LIBRARY} )
+endif(HYPHEN_FOUND)
Modified: trunk/Scribus/cmake/modules/FindLCMS.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindLCMS.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLCMS.cmake (original)
+++ trunk/Scribus/cmake/modules/FindLCMS.cmake Sun Nov 27 21:37:34 2016
@@ -10,52 +10,52 @@
# LIBLCMS_CFLAGS, cflags for include information
-# INCLUDE(UsePkgConfig)
+# include(UsePkgConfig)
# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
+# in the find_path() and find_library() calls
# PKGCONFIG(lcms _lcmsIncDir _lcmsLinkDir _lcmsLinkFlags _lcmsCflags)
-# SET(LCMS_LIBS ${_lcmsCflags})
+# set(LCMS_LIBS ${_lcmsCflags})
-FIND_PATH(LCMS_INCLUDE_DIR lcms.h
+find_path(LCMS_INCLUDE_DIR lcms.h
/usr/include
/usr/local/include
PATH_SUFFIXES lcms
)
-FIND_LIBRARY(LCMS_LIBRARY_RELEASE
+find_library(LCMS_LIBRARY_RELEASE
NAMES ${LCMS_NAMES_RELEASE} ${LCMS_NAMES} lcms liblcms lcmsdll
PATHS /usr/lib /usr/local/lib
)
-FIND_LIBRARY(LCMS_LIBRARY_DEBUG
+find_library(LCMS_LIBRARY_DEBUG
NAMES ${LCMS_NAMES_DEBUG} lcmsd liblcmsd lcmsdlld
PATHS /usr/lib /usr/local/lib
)
-INCLUDE(LibraryDebugAndRelease)
+include(LibraryDebugAndRelease)
SET_LIBRARY_FROM_DEBUG_AND_RELEASE(LCMS)
-MESSAGE("LCMS ReleaseLibrary: ${LCMS_LIBRARY_RELEASE}")
-MESSAGE("LCMS Debug Library: ${LCMS_LIBRARY_DEBUG}")
-MESSAGE("LCMS Library: ${LCMS_LIBRARY}")
+message("LCMS ReleaseLibrary: ${LCMS_LIBRARY_RELEASE}")
+message("LCMS Debug Library: ${LCMS_LIBRARY_DEBUG}")
+message("LCMS Library: ${LCMS_LIBRARY}")
-IF (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
- SET( LCMS_FOUND 1 )
- SET( LCMS_LIBRARIES ${LCMS_LIBRARY} )
-ELSE (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
- SET( LCMS_FOUND 0 )
-ENDIF (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
+if (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
+ set( LCMS_FOUND 1 )
+ set( LCMS_LIBRARIES ${LCMS_LIBRARY} )
+else (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
+ set( LCMS_FOUND 0 )
+endif (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
-SET(LCMS_FIND_QUIETLY 1)
+set(LCMS_FIND_QUIETLY 1)
-IF (LCMS_FOUND)
- IF (NOT LCMS_FIND_QUIETLY)
- MESSAGE(STATUS "Found LittleCMS: ${LCMS_LIBRARY}")
- ENDIF (NOT LCMS_FIND_QUIETLY)
-ELSE (LCMS_FOUND)
- IF (LCMS_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find LittleCMS")
- ENDIF (LCMS_FIND_REQUIRED)
-ENDIF (LCMS_FOUND)
+if (LCMS_FOUND)
+ if (NOT LCMS_FIND_QUIETLY)
+ message(STATUS "Found LittleCMS: ${LCMS_LIBRARY}")
+ endif (NOT LCMS_FIND_QUIETLY)
+else (LCMS_FOUND)
+ if (LCMS_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find LittleCMS")
+ endif (LCMS_FIND_REQUIRED)
+endif (LCMS_FOUND)
Modified: trunk/Scribus/cmake/modules/FindLCMS2.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindLCMS2.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLCMS2.cmake (original)
+++ trunk/Scribus/cmake/modules/FindLCMS2.cmake Sun Nov 27 21:37:34 2016
@@ -10,52 +10,52 @@
# LIBLCMS_CFLAGS, cflags for include information
-# INCLUDE(UsePkgConfig)
+# include(UsePkgConfig)
# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
+# in the find_path() and find_library() calls
# PKGCONFIG(lcms _lcmsIncDir _lcmsLinkDir _lcmsLinkFlags _lcmsCflags)
-# SET(LCMS2_LIBS ${_lcmsCflags})
+# set(LCMS2_LIBS ${_lcmsCflags})
-FIND_PATH(LCMS2_INCLUDE_DIR lcms2.h
+find_path(LCMS2_INCLUDE_DIR lcms2.h
/usr/include
/usr/local/include
PATH_SUFFIXES lcms2
)
-FIND_LIBRARY(LCMS2_LIBRARY_RELEASE
+find_library(LCMS2_LIBRARY_RELEASE
NAMES ${LCMS2_NAMES_RELEASE} ${LCMS2_NAMES} lcms2 liblcms2 lcms2dll
PATHS /usr/lib /usr/local/lib
)
-FIND_LIBRARY(LCMS2_LIBRARY_DEBUG
+find_library(LCMS2_LIBRARY_DEBUG
NAMES ${LCMS2_NAMES_DEBUG} lcms2d liblcms2d lcms2dlld
PATHS /usr/lib /usr/local/lib
)
-INCLUDE(LibraryDebugAndRelease)
+include(LibraryDebugAndRelease)
SET_LIBRARY_FROM_DEBUG_AND_RELEASE(LCMS2)
-MESSAGE("LCMS 2 ReleaseLibrary: ${LCMS2_LIBRARY_RELEASE}")
-MESSAGE("LCMS 2 Debug Library: ${LCMS2_LIBRARY_DEBUG}")
-MESSAGE("LCMS 2 Library: ${LCMS2_LIBRARY}")
+message("LCMS 2 ReleaseLibrary: ${LCMS2_LIBRARY_RELEASE}")
+message("LCMS 2 Debug Library: ${LCMS2_LIBRARY_DEBUG}")
+message("LCMS 2 Library: ${LCMS2_LIBRARY}")
-IF (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
- SET( LCMS2_FOUND 1 )
- SET( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
-ELSE (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
- SET( LCMS2_FOUND 0 )
-ENDIF (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
+if (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
+ set( LCMS2_FOUND 1 )
+ set( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
+else (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
+ set( LCMS2_FOUND 0 )
+endif (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
-SET(LCMS2_FIND_QUIETLY 1)
+set(LCMS2_FIND_QUIETLY 1)
-IF (LCMS2_FOUND)
- IF (NOT LCMS2_FIND_QUIETLY)
- MESSAGE(STATUS "Found LittleCMS 2: ${LCMS2_LIBRARY}")
- ENDIF (NOT LCMS2_FIND_QUIETLY)
-ELSE (LCMS2_FOUND)
- IF (LCMS2_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Could not find LittleCMS")
- ENDIF (LCMS2_FIND_REQUIRED)
-ENDIF (LCMS2_FOUND)
+if (LCMS2_FOUND)
+ if (NOT LCMS2_FIND_QUIETLY)
+ message(STATUS "Found LittleCMS 2: ${LCMS2_LIBRARY}")
+ endif (NOT LCMS2_FIND_QUIETLY)
+else (LCMS2_FOUND)
+ if (LCMS2_FIND_REQUIRED)
+ message(FATAL_ERROR "Could not find LittleCMS")
+ endif (LCMS2_FIND_REQUIRED)
+endif (LCMS2_FOUND)
Modified: trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake (original)
+++ trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake Sun Nov 27 21:37:34 2016
@@ -1,18 +1,18 @@
-SET(useshared)
-IF(WIN32)
- IF(NOT DEFINED LIBPODOFO_SHARED)
- MESSAGE("FATAL: Win32 users MUST set LIBPODOFO_SHARED")
- MESSAGE("FATAL: Set -DLIBPODOFO_SHARED=0 if linking to a static library PoDoFo")
- MESSAGE("FATAL: or -DLIBPODOFO_SHARED=1 if linking to a DLL build of PoDoFo")
- MESSAGE(FATAL_ERROR "LIBPODOFO_SHARED unset on win32 build")
- ELSE(NOT DEFINED LIBPODOFO_SHARED)
- IF(LIBPODOFO_SHARED)
- SET(useshared "-DUSING_SHARED_PODOFO")
- ENDIF(LIBPODOFO_SHARED)
- ENDIF(NOT DEFINED LIBPODOFO_SHARED)
-ENDIF(WIN32)
+set(useshared)
+if(WIN32)
+ if(NOT DEFINED LIBPODOFO_SHARED)
+ message("FATAL: Win32 users MUST set LIBPODOFO_SHARED")
+ message("FATAL: Set -DLIBPODOFO_SHARED=0 if linking to a static library PoDoFo")
+ message("FATAL: or -DLIBPODOFO_SHARED=1 if linking to a DLL build of PoDoFo")
+ message(FATAL_ERROR "LIBPODOFO_SHARED unset on win32 build")
+ else(NOT DEFINED LIBPODOFO_SHARED)
+ if(LIBPODOFO_SHARED)
+ set(useshared "-DUSING_SHARED_PODOFO")
+ endif(LIBPODOFO_SHARED)
+ endif(NOT DEFINED LIBPODOFO_SHARED)
+endif(WIN32)
-FIND_PATH(LIBPODOFO_INCLUDE_DIR
+find_path(LIBPODOFO_INCLUDE_DIR
NAMES podofo/podofo.h
PATHS
"${LIBPODOFO_DIR}/include"
@@ -22,9 +22,9 @@
/usr/local/include
)
-SET(LIBPODOFO_FIND_QUIETLY 1)
+set(LIBPODOFO_FIND_QUIETLY 1)
-FIND_LIBRARY(LIBPODOFO_LIBRARY
+find_library(LIBPODOFO_LIBRARY
NAMES libpodofo podofo
PATHS
"${LIBPODOFO_DIR}/lib"
@@ -33,8 +33,8 @@
/usr/lib /usr/local/lib
)
-IF(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
- SET(LIBPODOFO_FOUND TRUE CACHE BOOLEAN "Was libpodofo found")
+if(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
+ set(LIBPODOFO_FOUND TRUE CACHE BOOLEAN "Was libpodofo found")
file(STRINGS "${LIBPODOFO_INCLUDE_DIR}/podofo/base/podofo_config.h" PODOFO_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$")
file(STRINGS "${LIBPODOFO_INCLUDE_DIR}/podofo/base/podofo_config.h" PODOFO_MINOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+[0-9]+$")
@@ -42,28 +42,28 @@
string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+([0-9]+)$" "\\1" PODOFO_MAJOR_VER "${PODOFO_MAJOR_VER_LINE}")
string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_MINOR[ \t]+([0-9]+)$" "\\1" PODOFO_MINOR_VER "${PODOFO_MINOR_VER_LINE}")
string(REGEX REPLACE "^#define[ \t]+PODOFO_VERSION_PATCH[ \t]+([0-9]+)$" "\\1" PODOFO_PATCH_VER "${PODOFO_PATCH_VER_LINE}")
-# MESSAGE(STATUS "PODOFO MAJOR VERSION ${PODOFO_MAJOR_VER}")
-# MESSAGE(STATUS "PODOFO MINOR VERSION ${PODOFO_MINOR_VER}")
-# MESSAGE(STATUS "PODOFO PATCH VERSION ${PODOFO_PATCH_VER}")
- SET(LIBPODOFO_VERSION "${PODOFO_MAJOR_VER}.${PODOFO_MINOR_VER}.${PODOFO_PATCH_VER}" CACHE STRING "PoDoFo version string")
+# message(STATUS "PODOFO MAJOR VERSION ${PODOFO_MAJOR_VER}")
+# message(STATUS "PODOFO MINOR VERSION ${PODOFO_MINOR_VER}")
+# message(STATUS "PODOFO PATCH VERSION ${PODOFO_PATCH_VER}")
+ set(LIBPODOFO_VERSION "${PODOFO_MAJOR_VER}.${PODOFO_MINOR_VER}.${PODOFO_PATCH_VER}" CACHE STRING "PoDoFo version string")
-ENDIF(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
+endif(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
-SET(LIBPODOFO_CFLAGS "${useshared}" CACHE STRING "Extra flags for compiling against PoDoFo")
+set(LIBPODOFO_CFLAGS "${useshared}" CACHE STRING "Extra flags for compiling against PoDoFo")
-IF(NOT LIBPODOFO_FIND_QUIETLY)
- IF(LIBPODOFO_INCLUDE_DIR)
- MESSAGE("podofo/podofo.h: ${LIBPODOFO_INCLUDE_DIR}")
- ELSE(LIBPODOFO_INCLUDE_DIR)
- MESSAGE("podofo/podofo.h: not found")
- ENDIF(LIBPODOFO_INCLUDE_DIR)
+if(NOT LIBPODOFO_FIND_QUIETLY)
+ if(LIBPODOFO_INCLUDE_DIR)
+ message("podofo/podofo.h: ${LIBPODOFO_INCLUDE_DIR}")
+ else(LIBPODOFO_INCLUDE_DIR)
+ message("podofo/podofo.h: not found")
+ endif(LIBPODOFO_INCLUDE_DIR)
- IF(LIBPODOFO_LIBRARY)
- MESSAGE("podofo lib: ${LIBPODOFO_LIBRARY}")
- ELSE(LIBPODOFO_LIBRARY)
- MESSAGE("podofo lib: not found")
- ENDIF(LIBPODOFO_LIBRARY)
+ if(LIBPODOFO_LIBRARY)
+ message("podofo lib: ${LIBPODOFO_LIBRARY}")
+ else(LIBPODOFO_LIBRARY)
+ message("podofo lib: not found")
+ endif(LIBPODOFO_LIBRARY)
- MESSAGE("PoDoFo cflags: ${useshared}")
+ message("PoDoFo cflags: ${useshared}")
-ENDIF(NOT LIBPODOFO_FIND_QUIETLY)
+endif(NOT LIBPODOFO_FIND_QUIETLY)
Modified: trunk/Scribus/cmake/modules/FindOSG.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindOSG.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindOSG.cmake (original)
+++ trunk/Scribus/cmake/modules/FindOSG.cmake Sun Nov 27 21:37:34 2016
@@ -9,7 +9,7 @@
#
# Created by Robert Osfield.
-FIND_PATH(OSG_INCLUDE_DIR osg/Node
+find_path(OSG_INCLUDE_DIR osg/Node
${OSG_DIR}/include
$ENV{OSG_DIR}/include
$ENV{OSG_DIR}
@@ -19,11 +19,11 @@
NO_DEFAULT_PATH
)
-FIND_PATH(OSG_INCLUDE_DIR osg/Node)
+find_path(OSG_INCLUDE_DIR osg/Node)
-MACRO(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
+macro(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
- FIND_LIBRARY("${MYLIBRARY}_DEBUG"
+ find_library("${MYLIBRARY}_DEBUG"
NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
PATHS
${OSG_DIR}/lib/Debug
@@ -37,7 +37,7 @@
NO_DEFAULT_PATH
)
- FIND_LIBRARY("${MYLIBRARY}_DEBUG"
+ find_library("${MYLIBRARY}_DEBUG"
NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
PATHS
~/Library/Frameworks
@@ -54,7 +54,7 @@
/usr/freeware/lib64
)
- FIND_LIBRARY(${MYLIBRARY}
+ find_library(${MYLIBRARY}
NAMES ${MYLIBRARYNAME}
PATHS
${OSG_DIR}/lib/Release
@@ -68,7 +68,7 @@
NO_DEFAULT_PATH
)
- FIND_LIBRARY(${MYLIBRARY}
+ find_library(${MYLIBRARY}
NAMES ${MYLIBRARYNAME}
PATHS
~/Library/Frameworks
@@ -85,13 +85,13 @@
/usr/freeware/lib64
)
- IF( NOT ${MYLIBRARY}_DEBUG)
- IF(MYLIBRARY)
- SET(${MYLIBRARY}_DEBUG ${MYLIBRARY})
- ENDIF(MYLIBRARY)
- ENDIF( NOT ${MYLIBRARY}_DEBUG)
+ if( NOT ${MYLIBRARY}_DEBUG)
+ if(MYLIBRARY)
+ set(${MYLIBRARY}_DEBUG ${MYLIBRARY})
+ endif(MYLIBRARY)
+ endif( NOT ${MYLIBRARY}_DEBUG)
-ENDMACRO(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
+endmacro(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
FIND_OSG_LIBRARY(OSG_LIBRARY osg)
FIND_OSG_LIBRARY(OSGGA_LIBRARY osgGA)
@@ -105,9 +105,9 @@
FIND_OSG_LIBRARY(OSGVOLUME_LIBRARY osgVolume)
FIND_OSG_LIBRARY(OPENTHREADS_LIBRARY OpenThreads)
-SET(OSG_FOUND "NO")
-IF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
- SET(OSG_FOUND "YES")
-ELSE(OSG_LIBRARY AND OSG_INCLUDE_DIR)
- SET(OSG_INCLUDE_DIR "")
-ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR)
+set(OSG_FOUND "NO")
+if(OSG_LIBRARY AND OSG_INCLUDE_DIR)
+ set(OSG_FOUND "YES")
+else(OSG_LIBRARY AND OSG_INCLUDE_DIR)
+ set(OSG_INCLUDE_DIR "")
+endif(OSG_LIBRARY AND OSG_INCLUDE_DIR)
Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake (original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake Sun Nov 27 21:37:34 2016
@@ -1,29 +1,29 @@
-IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
- INCLUDE(UsePkgConfig)
+if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(UsePkgConfig)
PKGCONFIG(poppler _libPopplerIncDir _libPopplerLinkDir _libPopplerLinkFlags _libPopplerCflags)
- SET(PKG_POPPLER_INCLUDE_DIRS ${_libPopplerIncDir})
- SET(PKG_POPPLER_LIBRARIES ${_libPopplerLinkDir})
- ELSE (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
- INCLUDE(FindPkgConfig)
+ set(PKG_POPPLER_INCLUDE_DIRS ${_libPopplerIncDir})
+ set(PKG_POPPLER_LIBRARIES ${_libPopplerLinkDir})
+ else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(FindPkgConfig)
pkg_search_module(POPPLER libpoppler>=0.19.0 poppler>=0.19.0)
- ENDIF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
-FIND_PATH(POPPLER_INCLUDE_DIR
+ endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+find_path(POPPLER_INCLUDE_DIR
NAMES poppler-config.h
PATHS ${PKG_POPPLER_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS} /usr/local/include /usr/include
PATH_SUFFIXES poppler
NO_DEFAULT_PATH
)
-FIND_LIBRARY(POPPLER_LIBRARY
+find_library(POPPLER_LIBRARY
NAMES libpoppler poppler
PATHS ${PKG_POPPLER_LIBRARIES} ${POPPLER_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
PATH_SUFFIXES poppler
NO_DEFAULT_PATH
)
-IF (POPPLER_LIBRARY)
- IF (POPPLER_INCLUDE_DIR)
- SET( FOUND_POPPLER 1 )
- SET( POPPLER_LIBRARIES ${POPPLER_LIBRARY} )
- SET( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR})
- ENDIF (POPPLER_INCLUDE_DIR)
-ENDIF (POPPLER_LIBRARY)
+if (POPPLER_LIBRARY)
+ if (POPPLER_INCLUDE_DIR)
+ set( FOUND_POPPLER 1 )
+ set( POPPLER_LIBRARIES ${POPPLER_LIBRARY} )
+ set( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR})
+ endif (POPPLER_INCLUDE_DIR)
+endif (POPPLER_LIBRARY)
Modified: trunk/Scribus/cmake/modules/FindZLIB.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/FindZLIB.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindZLIB.cmake (original)
+++ trunk/Scribus/cmake/modules/FindZLIB.cmake Sun Nov 27 21:37:34 2016
@@ -6,50 +6,50 @@
# ZLIB_FOUND - True if zlib found.
-IF (ZLIB_INCLUDE_DIR)
+if (ZLIB_INCLUDE_DIR)
# Already in cache, be silent
- SET(ZLIB_FIND_QUIETLY TRUE)
-ENDIF (ZLIB_INCLUDE_DIR)
+ set(ZLIB_FIND_QUIETLY TRUE)
+endif (ZLIB_INCLUDE_DIR)
-FIND_PATH(ZLIB_INCLUDE_DIR zlib.h)
+find_path(ZLIB_INCLUDE_DIR zlib.h)
# On win32, qt statically links to zlib and libpng, and exports their symbols.
# We can just link to Qt to get zlib and libpng. We still require the user to
# supply their own headers on the search path, but they can and should just
# specify ${QTDIR}/src/3rdparty/zlib/include .
# To use this, you must use FindQt before FindZlib.
-IF(QT_QTCORE_LIBRARY AND USE_QT_ZLIB_PNGLIB)
+if(QT_QTCORE_LIBRARY AND USE_QT_ZLIB_PNGLIB)
- MESSAGE("Using zlib from qt")
- SET(ZLIB_LIBRARY_RELEASE ${QT_QTCORE_LIBRARY_RELEASE})
- SET(ZLIB_LIBRARY_DEBUG ${QT_QTCORE_LIBRARY_DEBUG})
- SET(ZLIB_LIBRARY ${QT_QTCORE_LIBRARY})
+ message("Using zlib from qt")
+ set(ZLIB_LIBRARY_RELEASE ${QT_QTCORE_LIBRARY_RELEASE})
+ set(ZLIB_LIBRARY_DEBUG ${QT_QTCORE_LIBRARY_DEBUG})
+ set(ZLIB_LIBRARY ${QT_QTCORE_LIBRARY})
-ELSE(QT_QTCORE_LIBRARY AND USE_QT_ZLIB_PNGLIB)
+else(QT_QTCORE_LIBRARY AND USE_QT_ZLIB_PNGLIB)
- SET(ZLIB_NAMES_RELEASE ${ZLIB_NAMES_RELEASE} ${ZLIB_NAMES} z zlib zdll zlib1)
- FIND_LIBRARY(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES_RELEASE} )
+ set(ZLIB_NAMES_RELEASE ${ZLIB_NAMES_RELEASE} ${ZLIB_NAMES} z zlib zdll zlib1)
+ find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES_RELEASE} )
# Find a debug library if one exists and use that for debug builds.
# This really only does anything for win32, but does no harm on other
# platforms.
- SET(ZLIB_NAMES_DEBUG ${ZLIB_NAMES_DEBUG} zlibd zlib1d)
- FIND_LIBRARY(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG})
+ set(ZLIB_NAMES_DEBUG ${ZLIB_NAMES_DEBUG} zlibd zlib1d)
+ find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG})
- INCLUDE(LibraryDebugAndRelease)
+ include(LibraryDebugAndRelease)
SET_LIBRARY_FROM_DEBUG_AND_RELEASE(ZLIB)
-ENDIF(QT_QTCORE_LIBRARY AND USE_QT_ZLIB_PNGLIB)
+endif(QT_QTCORE_LIBRARY AND USE_QT_ZLIB_PNGLIB)
# handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if
# all listed variables are TRUE
-INCLUDE(ScribusFindPackageHandleStandardArgs)
+include(ScribusFindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
-IF(ZLIB_FOUND)
- SET( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
-ELSE(ZLIB_FOUND)
- SET( ZLIB_LIBRARIES )
-ENDIF(ZLIB_FOUND)
+if(ZLIB_FOUND)
+ set( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
+else(ZLIB_FOUND)
+ set( ZLIB_LIBRARIES )
+endif(ZLIB_FOUND)
-MARK_AS_ADVANCED( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
+mark_as_advanced( ZLIB_LIBRARY ZLIB_INCLUDE_DIR )
Modified: trunk/Scribus/cmake/modules/LibXml2Config.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/LibXml2Config.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/LibXml2Config.cmake (original)
+++ trunk/Scribus/cmake/modules/LibXml2Config.cmake Sun Nov 27 21:37:34 2016
@@ -7,37 +7,37 @@
# LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2
#
# use pkg-config to get the directories and then use these values
-# in the FIND_PATH() and FIND_LIBRARY() calls
+# in the find_path() and find_library() calls
-INCLUDE(UsePkgConfig)
+include(UsePkgConfig)
PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
-SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
+set(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
-FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
+find_path(LIBXML2_INCLUDE_DIR libxml/xpath.h
PATHS ${_LibXml2IncDir} PATH_SUFFIXES libxml2
)
-FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2
+find_library(LIBXML2_LIBRARIES NAMES xml2 libxml2
PATHS ${_LibXml2LinkDir}
)
-IF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
- SET(LIBXML2_FOUND TRUE)
-ENDIF (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
+ set(LIBXML2_FOUND TRUE)
+endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-SET(LibXml2_FIND_QUIETLY 1)
+set(LibXml2_FIND_QUIETLY 1)
-IF (LIBXML2_FOUND)
- IF (NOT LibXml2_FIND_QUIETLY)
- MESSAGE(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
- ENDIF (NOT LibXml2_FIND_QUIETLY)
-ELSE (LIBXML2_FOUND)
- IF (LibXml2_FIND_REQUIRED)
- MESSAGE(SEND_ERROR "Could NOT find LibXml2")
- ENDIF (LibXml2_FIND_REQUIRED)
-ENDIF (LIBXML2_FOUND)
+if (LIBXML2_FOUND)
+ if (NOT LibXml2_FIND_QUIETLY)
+ message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
+ endif (NOT LibXml2_FIND_QUIETLY)
+else (LIBXML2_FOUND)
+ if (LibXml2_FIND_REQUIRED)
+ message(SEND_ERROR "Could NOT find LibXml2")
+ endif (LibXml2_FIND_REQUIRED)
+endif (LIBXML2_FOUND)
-MARK_AS_ADVANCED(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
+mark_as_advanced(LIBXML2_INCLUDE_DIR LIBXML2_LIBRARIES)
Modified: trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake (original)
+++ trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake Sun Nov 27 21:37:34 2016
@@ -6,20 +6,20 @@
#
# If only one build exists, we use that one irrespective of build type.
#
-MACRO(SET_LIBRARY_FROM_DEBUG_AND_RELEASE _NAME)
+macro(SET_LIBRARY_FROM_DEBUG_AND_RELEASE _NAME)
- IF(NOT DEFINED "${_NAME}_LIBRARY_RELEASE" OR NOT DEFINED "${_NAME}_LIBRARY_DEBUG")
- MESSAGE(FATAL_ERROR "${_NAME}_LIBRARY_DEBUG OR ${_NAME}_LIBRARY_RELEASE undefined")
- ENDIF(NOT DEFINED "${_NAME}_LIBRARY_RELEASE" OR NOT DEFINED "${_NAME}_LIBRARY_DEBUG")
- IF(${_NAME}_LIBRARY_RELEASE AND ${_NAME}_LIBRARY_DEBUG)
- SET(${_NAME}_LIBRARY "optimized;${${_NAME}_LIBRARY_RELEASE};debug;${${_NAME}_LIBRARY_DEBUG}")
- ELSE(${_NAME}_LIBRARY_RELEASE AND ${_NAME}_LIBRARY_DEBUG)
- IF(${_NAME}_LIBRARY_DEBUG)
- MESSAGE("WARNING: ${_NAME} debug library will be used even for release builds")
- SET(${_NAME}_LIBRARY ${${_NAME}_LIBRARY_DEBUG})
- ELSE(${_NAME}_LIBRARY_DEBUG)
- SET(${_NAME}_LIBRARY ${${_NAME}_LIBRARY_RELEASE})
- ENDIF(${_NAME}_LIBRARY_DEBUG)
- ENDIF(${_NAME}_LIBRARY_RELEASE AND ${_NAME}_LIBRARY_DEBUG)
+ if(NOT DEFINED "${_NAME}_LIBRARY_RELEASE" OR NOT DEFINED "${_NAME}_LIBRARY_DEBUG")
+ message(FATAL_ERROR "${_NAME}_LIBRARY_DEBUG OR ${_NAME}_LIBRARY_RELEASE undefined")
+ endif(NOT DEFINED "${_NAME}_LIBRARY_RELEASE" OR NOT DEFINED "${_NAME}_LIBRARY_DEBUG")
+ if(${_NAME}_LIBRARY_RELEASE AND ${_NAME}_LIBRARY_DEBUG)
+ set(${_NAME}_LIBRARY "optimized;${${_NAME}_LIBRARY_RELEASE};debug;${${_NAME}_LIBRARY_DEBUG}")
+ else(${_NAME}_LIBRARY_RELEASE AND ${_NAME}_LIBRARY_DEBUG)
+ if(${_NAME}_LIBRARY_DEBUG)
+ message("WARNING: ${_NAME} debug library will be used even for release builds")
+ set(${_NAME}_LIBRARY ${${_NAME}_LIBRARY_DEBUG})
+ else(${_NAME}_LIBRARY_DEBUG)
+ set(${_NAME}_LIBRARY ${${_NAME}_LIBRARY_RELEASE})
+ endif(${_NAME}_LIBRARY_DEBUG)
+ endif(${_NAME}_LIBRARY_RELEASE AND ${_NAME}_LIBRARY_DEBUG)
-ENDMACRO(SET_LIBRARY_FROM_DEBUG_AND_RELEASE)
+endmacro(SET_LIBRARY_FROM_DEBUG_AND_RELEASE)
Modified: trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake (original)
+++ trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake Sun Nov 27 21:37:34 2016
@@ -1,41 +1,41 @@
#Based on QT4_QRAP_UI/CPP from cmake 2.3.4
- MACRO(SCRIBUS_QT_WRAP_UI outfiles )
+ macro(SCRIBUS_QT_WRAP_UI outfiles )
- FOREACH(it ${ARGN})
- GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
- SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
- ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+ foreach(it ${ARGN})
+ get_filename_component(outfile ${it} NAME_WE)
+ set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
+ set(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
+ add_custom_command(OUTPUT ${outfile}
COMMAND ${QT_UIC_EXECUTABLE}
ARGS -o ${outfile} ${infile}
MAIN_DEPENDENCY ${infile})
- SET(${outfiles} ${${outfiles}} ${outfile})
- ENDFOREACH(it)
+ set(${outfiles} ${${outfiles}} ${outfile})
+ endforeach(it)
- ENDMACRO(SCRIBUS_QT_WRAP_UI)
+ endmacro(SCRIBUS_QT_WRAP_UI)
- MACRO(SCRIBUS_QT_WRAP_CPP outfiles )
+ macro(SCRIBUS_QT_WRAP_CPP outfiles )
# get include dirs
- GET_DIRECTORY_PROPERTY(moc_includes_tmp INCLUDE_DIRECTORIES)
- SET(moc_includes)
- #FOREACH(it ${moc_includes_tmp})
- # SET(moc_includes ${moc_includes} "-I${it}")
- #ENDFOREACH(it)
+ get_directory_property(moc_includes_tmp INCLUDE_DIRECTORIES)
+ set(moc_includes)
+ #foreach(it ${moc_includes_tmp})
+ # set(moc_includes ${moc_includes} "-I${it}")
+ #endforeach(it)
- FOREACH(it ${ARGN})
- GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE)
+ foreach(it ${ARGN})
+ get_filename_component(outfilename ${it} NAME_WE)
- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-# SET(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfilename}.moc)
- ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
+ get_filename_component(infile ${it} ABSOLUTE)
+# set(infile ${CMAKE_CURRENT_SOURCE_DIR}/${it})
+ set(outfile ${CMAKE_CURRENT_BINARY_DIR}/${outfilename}.moc)
+ add_custom_command(OUTPUT ${outfile}
COMMAND ${QT_MOC_EXECUTABLE}
# ARGS ${moc_includes} -o ${outfile} ${infile}
ARGS -o ${outfile} ${infile}
# MAIN_DEPENDENCY ${infile})
DEPENDS ${infile})
- SET(${outfiles} ${${outfiles}} ${outfile})
- ENDFOREACH(it)
+ set(${outfiles} ${${outfiles}} ${outfile})
+ endforeach(it)
- ENDMACRO(SCRIBUS_QT_WRAP_CPP)
+ endmacro(SCRIBUS_QT_WRAP_CPP)
Modified: trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake (original)
+++ trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake Sun Nov 27 21:37:34 2016
@@ -2,15 +2,15 @@
# This file was copied from CMake 2.5. It's used to permit CMake 2.4
# to use the CMake 2.5-derived find scripts here.
#
-IF (NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+if (NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
# Use the original from cmake 2.5 if possible
- INCLUDE(FindPackageHandleStandardArgs)
-ELSE(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+ include(FindPackageHandleStandardArgs)
+else(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
# or define our own...
# FIND_PACKAGE_HANDLE_STANDARD_ARGS(NAME (DEFAULT_MSG|"Custom failure message") VAR1 ... )
# This macro is intended to be used in FindXXX.cmake modules files.
-# It handles the REQUIRED and QUIET argument to FIND_PACKAGE() and
+# It handles the REQUIRED and QUIET argument to find_package() and
# it also sets the <UPPERCASED_NAME>_FOUND variable.
# The package is found if all variables listed are TRUE.
# Example:
@@ -27,40 +27,40 @@
# be "Could NOT find LibXml2", if you don't like this message you can specify
# your own custom failure message there.
-MACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
+macro(FIND_PACKAGE_HANDLE_STANDARD_ARGS _NAME _FAIL_MSG _VAR1 )
- IF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
- SET(_FAIL_MESSAGE "Could NOT find ${_NAME}")
- ELSE("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
- SET(_FAIL_MESSAGE "${_FAIL_MSG}")
- ENDIF("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+ if("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+ set(_FAIL_MESSAGE "Could NOT find ${_NAME}")
+ else("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
+ set(_FAIL_MESSAGE "${_FAIL_MSG}")
+ endif("${_FAIL_MSG}" STREQUAL "DEFAULT_MSG")
- STRING(TOUPPER ${_NAME} _NAME_UPPER)
+ string(TOUPPER ${_NAME} _NAME_UPPER)
- SET(${_NAME_UPPER}_FOUND TRUE)
- IF(NOT ${_VAR1})
- SET(${_NAME_UPPER}_FOUND FALSE)
- ENDIF(NOT ${_VAR1})
+ set(${_NAME_UPPER}_FOUND TRUE)
+ if(NOT ${_VAR1})
+ set(${_NAME_UPPER}_FOUND FALSE)
+ endif(NOT ${_VAR1})
- FOREACH(_CURRENT_VAR ${ARGN})
- IF(NOT ${_CURRENT_VAR})
- SET(${_NAME_UPPER}_FOUND FALSE)
- ENDIF(NOT ${_CURRENT_VAR})
- ENDFOREACH(_CURRENT_VAR)
+ foreach(_CURRENT_VAR ${ARGN})
+ if(NOT ${_CURRENT_VAR})
+ set(${_NAME_UPPER}_FOUND FALSE)
+ endif(NOT ${_CURRENT_VAR})
+ endforeach(_CURRENT_VAR)
- IF (${_NAME_UPPER}_FOUND)
- IF (NOT ${_NAME}_FIND_QUIETLY)
- MESSAGE(STATUS "Found ${_NAME}: ${${_VAR1}}")
- ENDIF (NOT ${_NAME}_FIND_QUIETLY)
- ELSE (${_NAME_UPPER}_FOUND)
- IF (${_NAME}_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "${_FAIL_MESSAGE}")
- ELSE (${_NAME}_FIND_REQUIRED)
- IF (NOT ${_NAME}_FIND_QUIETLY)
- MESSAGE(STATUS "${_FAIL_MESSAGE}")
- ENDIF (NOT ${_NAME}_FIND_QUIETLY)
- ENDIF (${_NAME}_FIND_REQUIRED)
- ENDIF (${_NAME_UPPER}_FOUND)
-ENDMACRO(FIND_PACKAGE_HANDLE_STANDARD_ARGS)
+ if (${_NAME_UPPER}_FOUND)
+ if (NOT ${_NAME}_FIND_QUIETLY)
+ message(STATUS "Found ${_NAME}: ${${_VAR1}}")
+ endif (NOT ${_NAME}_FIND_QUIETLY)
+ else (${_NAME_UPPER}_FOUND)
+ if (${_NAME}_FIND_REQUIRED)
+ message(FATAL_ERROR "${_FAIL_MESSAGE}")
+ else (${_NAME}_FIND_REQUIRED)
+ if (NOT ${_NAME}_FIND_QUIETLY)
+ message(STATUS "${_FAIL_MESSAGE}")
+ endif (NOT ${_NAME}_FIND_QUIETLY)
+ endif (${_NAME}_FIND_REQUIRED)
+ endif (${_NAME_UPPER}_FOUND)
+endmacro(FIND_PACKAGE_HANDLE_STANDARD_ARGS)
-ENDIF(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+endif(NOT ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
Modified: trunk/Scribus/cmake/modules/cmakeconfigreport.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake/modules/cmakeconfigreport.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/cmakeconfigreport.cmake (original)
+++ trunk/Scribus/cmake/modules/cmakeconfigreport.cmake Sun Nov 27 21:37:34 2016
@@ -1,134 +1,134 @@
##############################################################################################################
########## Report on installed dependencies and offered features ##########
-MESSAGE("")
-MESSAGE("--------------------------------------------------")
-MESSAGE("-- Configuration Summary")
-MESSAGE("--------------------------------------------------")
+message("")
+message("--------------------------------------------------")
+message("-- Configuration Summary")
+message("--------------------------------------------------")
if (HAVE_LIBZ)
- MESSAGE(STATUS "libz found: Compression support enabled")
+ message(STATUS "libz found: Compression support enabled")
else (HAVE_LIBZ)
- MESSAGE(STATUS "libz not found: Compression support disabled")
+ message(STATUS "libz not found: Compression support disabled")
endif (HAVE_LIBZ)
if (HAVE_XML)
- MESSAGE(STATUS "libxml2 found: XML support enabled")
+ message(STATUS "libxml2 found: XML support enabled")
else (HAVE_XML)
- MESSAGE(STATUS "libxml2 not found: XML support disabled")
+ message(STATUS "libxml2 not found: XML support disabled")
endif (HAVE_XML)
if (HAVE_PYTHON)
- MESSAGE(STATUS "Python found: Scripting support enabled")
+ message(STATUS "Python found: Scripting support enabled")
else (HAVE_PYTHON)
- MESSAGE(STATUS "Python not found: Scripting support disabled")
+ message(STATUS "Python not found: Scripting support disabled")
endif (HAVE_PYTHON)
if (CAIRO_FOUND)
- MESSAGE(STATUS "cairo found ok")
+ message(STATUS "cairo found ok")
else (CAIRO_FOUND)
- MESSAGE(STATUS "cairo not found")
+ message(STATUS "cairo not found")
endif (CAIRO_FOUND)
if (HAVE_CUPS)
- MESSAGE(STATUS "cups found: Printing support enabled")
+ message(STATUS "cups found: Printing support enabled")
else (HAVE_CUPS)
- MESSAGE(STATUS "cups not found: Print support disabled")
+ message(STATUS "cups not found: Print support disabled")
endif (HAVE_CUPS)
if (HAVE_LCMS2)
- MESSAGE(STATUS "littleCMS2 found: Color management support enabled")
+ message(STATUS "littleCMS2 found: Color management support enabled")
else (HAVE_LCMS2)
- MESSAGE(STATUS "littleCMS2 not found: Color management support disabled")
+ message(STATUS "littleCMS2 not found: Color management support disabled")
endif (HAVE_LCMS2)
if (HAVE_HUNSPELL)
- MESSAGE(STATUS "Hunspell found: Spell correction support enabled")
+ message(STATUS "Hunspell found: Spell correction support enabled")
else (HAVE_HUNSPELL)
- MESSAGE(STATUS "Hunspell not found: Spell correction support disabled")
+ message(STATUS "Hunspell not found: Spell correction support disabled")
endif (HAVE_HUNSPELL)
if (HAVE_PODOFO)
- MESSAGE(STATUS "podofo found: PDF import support enabled")
+ message(STATUS "podofo found: PDF import support enabled")
else (HAVE_PODOFO)
- MESSAGE(STATUS "podofo not found: PDF import support disabled")
+ message(STATUS "podofo not found: PDF import support disabled")
endif (HAVE_PODOFO)
if (HAVE_POPPLER)
- MESSAGE(STATUS "poppler found: PDF import support enabled")
+ message(STATUS "poppler found: PDF import support enabled")
else (HAVE_POPPLER)
- MESSAGE(STATUS "poppler not found: PDF import support disabled")
+ message(STATUS "poppler not found: PDF import support disabled")
endif (HAVE_POPPLER)
if (HAVE_BOOST)
- MESSAGE(STATUS "boost found: Extra geometric tools support enabled")
+ message(STATUS "boost found: Extra geometric tools support enabled")
else (HAVE_BOOST)
- MESSAGE(STATUS "boost not found: Extra geometric tools support disabled")
+ message(STATUS "boost not found: Extra geometric tools support disabled")
endif (HAVE_BOOST)
-MESSAGE("--")
-MESSAGE("-- Image formats:")
+message("--")
+message("-- Image formats:")
if (JPEG_FOUND)
- MESSAGE(STATUS "libjpeg found: JPEG support enabled")
+ message(STATUS "libjpeg found: JPEG support enabled")
else (JPEG_FOUND)
- MESSAGE(STATUS "libjpeg not found: JPEG support disabled")
+ message(STATUS "libjpeg not found: JPEG support disabled")
endif (JPEG_FOUND)
if (HAVE_TIFF)
- MESSAGE(STATUS "libtiff found: TIFF support enabled")
+ message(STATUS "libtiff found: TIFF support enabled")
else (HAVE_TIFF)
- MESSAGE(STATUS "libtiff not found: TIFF support disabled")
+ message(STATUS "libtiff not found: TIFF support disabled")
endif (HAVE_TIFF)
if (HAVE_OSG)
- MESSAGE(STATUS "osg found: Support for for OSG 3D Extension be supported")
+ message(STATUS "osg found: Support for for OSG 3D Extension be supported")
else (HAVE_OSG)
- MESSAGE(STATUS "osg not found: Support for OSG 3D Extension not be supported")
+ message(STATUS "osg not found: Support for OSG 3D Extension not be supported")
endif (HAVE_OSG)
if (HAVE_REVENGE)
- MESSAGE(STATUS "librevenge found: Support for proprietary file import will be supported")
+ message(STATUS "librevenge found: Support for proprietary file import will be supported")
else (HAVE_REVENGE)
- MESSAGE(STATUS "librevenge not found: Support for proprietary file import will not be supported")
+ message(STATUS "librevenge not found: Support for proprietary file import will not be supported")
endif (HAVE_REVENGE)
if (HAVE_LIBVISIO)
- MESSAGE(STATUS "libvisio found: Support for Microsoft Visio files will be supported")
+ message(STATUS "libvisio found: Support for Microsoft Visio files will be supported")
else (HAVE_LIBVISIO)
- MESSAGE(STATUS "libvisio not found: Support for Microsoft Visio files will not be supported")
+ message(STATUS "libvisio not found: Support for Microsoft Visio files will not be supported")
endif (HAVE_LIBVISIO)
if (LIBCDR_FOUND)
- MESSAGE(STATUS "libcdr found: Support for CorelDraw files will be supported")
+ message(STATUS "libcdr found: Support for CorelDraw files will be supported")
else (LIBCDR_FOUND)
- MESSAGE(STATUS "libcdr not found: Support for CorelDraw files will not be supported")
+ message(STATUS "libcdr not found: Support for CorelDraw files will not be supported")
endif (LIBCDR_FOUND)
if (LIBVISIO_FOUND)
- MESSAGE(STATUS "libvisio found: Support for Microsoft Visio files will be supported")
+ message(STATUS "libvisio found: Support for Microsoft Visio files will be supported")
else (LIBVISIO_FOUND)
- MESSAGE(STATUS "libvisio not found: Support for Microsoft Visio files will not be supported")
+ message(STATUS "libvisio not found: Support for Microsoft Visio files will not be supported")
endif (LIBVISIO_FOUND)
if (LIBMSPUB_FOUND)
- MESSAGE(STATUS "libmspub found: Support for Microsoft Publisher files will be supported")
+ message(STATUS "libmspub found: Support for Microsoft Publisher files will be supported")
else (LIBMSPUB_FOUND)
- MESSAGE(STATUS "libmspub not found: Support for Microsoft Publisher files will not be supported")
+ message(STATUS "libmspub not found: Support for Microsoft Publisher files will not be supported")
endif (LIBMSPUB_FOUND)
if (LIBPAGEMAKER_FOUND)
- MESSAGE(STATUS "libpagemaker found: Support for PageMaker files will be supported")
+ message(STATUS "libpagemaker found: Support for PageMaker files will be supported")
else (LIBPAGEMAKER_FOUND)
- MESSAGE(STATUS "libpagemaker not found: Support for PageMaker files will not be supported")
+ message(STATUS "libpagemaker not found: Support for PageMaker files will not be supported")
endif (LIBPAGEMAKER_FOUND)
if (GMAGICK_FOUND)
- MESSAGE(STATUS "graphicsmagick found: Support for extra graphics formats will be supported")
+ message(STATUS "graphicsmagick found: Support for extra graphics formats will be supported")
else (GMAGICK_FOUND)
- MESSAGE(STATUS "graphicsmagick not found: Support for extra graphics formats files will not be supported")
+ message(STATUS "graphicsmagick not found: Support for extra graphics formats files will not be supported")
endif (GMAGICK_FOUND)
-MESSAGE("--------------------------------------------------")
-MESSAGE("")
+message("--------------------------------------------------")
+message("")
Modified: trunk/Scribus/cmake_uninstall.cmake.in
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/cmake_uninstall.cmake.in
==============================================================================
--- trunk/Scribus/cmake_uninstall.cmake.in (original)
+++ trunk/Scribus/cmake_uninstall.cmake.in Sun Nov 27 21:37:34 2016
@@ -1,21 +1,21 @@
-IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
- MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
-ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+if(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+ message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
-FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
-STRING(REGEX REPLACE "\n" ";" files "${files}")
-FOREACH(file ${files})
- MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
- IF(EXISTS "$ENV{DESTDIR}${file}")
- EXEC_PROGRAM(
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+foreach(file ${files})
+ message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+ if(EXISTS "$ENV{DESTDIR}${file}")
+ exec_program(
"@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
OUTPUT_VARIABLE rm_out
RETURN_VALUE rm_retval
)
- IF(NOT "${rm_retval}" STREQUAL 0)
- MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
- ENDIF(NOT "${rm_retval}" STREQUAL 0)
- ELSE(EXISTS "$ENV{DESTDIR}${file}")
- MESSAGE(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
- ENDIF(EXISTS "$ENV{DESTDIR}${file}")
-ENDFOREACH(file)
+ if(NOT "${rm_retval}" STREQUAL 0)
+ message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+ endif(NOT "${rm_retval}" STREQUAL 0)
+ else(EXISTS "$ENV{DESTDIR}${file}")
+ message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+ endif(EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)
Modified: trunk/Scribus/doc/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/CMakeLists.txt (original)
+++ trunk/Scribus/doc/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,3 +1,3 @@
-ADD_SUBDIRECTORY(en)
-ADD_SUBDIRECTORY(de)
-ADD_SUBDIRECTORY(it)
+add_subdirectory(en)
+add_subdirectory(de)
+add_subdirectory(it)
Modified: trunk/Scribus/doc/cs/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/cs/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/cs/CMakeLists.txt (original)
+++ trunk/Scribus/doc/cs/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1 +1 @@
-ADD_SUBDIRECTORY(tutorials/short-words)
+add_subdirectory(tutorials/short-words)
Modified: trunk/Scribus/doc/cs/tutorials/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/cs/tutorials/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/cs/tutorials/short-words/CMakeLists.txt (original)
+++ trunk/Scribus/doc/cs/tutorials/short-words/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
menu.xml
after_short_words.png
before_short_words.png
Modified: trunk/Scribus/doc/de/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/de/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/de/CMakeLists.txt (original)
+++ trunk/Scribus/doc/de/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,5 +1,5 @@
-ADD_SUBDIRECTORY(images)
+add_subdirectory(images)
#Install our html files
-FILE( GLOB SCRIBUS_DOC_DE_FILES *.html *.xml )
-INSTALL(FILES ${SCRIBUS_DOC_DE_FILES} DESTINATION ${DOCDIR}de)
+file( GLOB SCRIBUS_DOC_DE_FILES *.html *.xml )
+install(FILES ${SCRIBUS_DOC_DE_FILES} DESTINATION ${DOCDIR}de)
Modified: trunk/Scribus/doc/de/images/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/de/images/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/de/images/CMakeLists.txt (original)
+++ trunk/Scribus/doc/de/images/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
#Install our image files
-FILE( GLOB SCRIBUS_DOC_DE_IMAGES_FILES *.jpg *.png )
+file( GLOB SCRIBUS_DOC_DE_IMAGES_FILES *.jpg *.png )
-INSTALL(FILES ${SCRIBUS_DOC_DE_IMAGES_FILES} DESTINATION ${DOCDIR}de/images)
+install(FILES ${SCRIBUS_DOC_DE_IMAGES_FILES} DESTINATION ${DOCDIR}de/images)
Modified: trunk/Scribus/doc/en/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/en/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/en/CMakeLists.txt (original)
+++ trunk/Scribus/doc/en/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,10 +1,10 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-ADD_SUBDIRECTORY(images)
-ADD_SUBDIRECTORY(tutorials/short-words)
+add_subdirectory(images)
+add_subdirectory(tutorials/short-words)
#Install our html files
-FILE( GLOB SCRIBUS_DOC_EN_FILES *.html *.xml *.css )
-INSTALL(FILES ${SCRIBUS_DOC_EN_FILES} DESTINATION ${DOCDIR}en)
+file( GLOB SCRIBUS_DOC_EN_FILES *.html *.xml *.css )
+install(FILES ${SCRIBUS_DOC_EN_FILES} DESTINATION ${DOCDIR}en)
Modified: trunk/Scribus/doc/en/images/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/en/images/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/en/images/CMakeLists.txt (original)
+++ trunk/Scribus/doc/en/images/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
#Install our image files
-FILE( GLOB SCRIBUS_DOC_EN_IMAGES_FILES *.jpg *.png )
+file( GLOB SCRIBUS_DOC_EN_IMAGES_FILES *.jpg *.png )
-INSTALL(FILES ${SCRIBUS_DOC_EN_IMAGES_FILES} DESTINATION ${DOCDIR}en/images)
+install(FILES ${SCRIBUS_DOC_EN_IMAGES_FILES} DESTINATION ${DOCDIR}en/images)
Modified: trunk/Scribus/doc/en/tutorials/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/en/tutorials/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/en/tutorials/short-words/CMakeLists.txt (original)
+++ trunk/Scribus/doc/en/tutorials/short-words/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
menu.xml
after_short_words.png
before_short_words.png
Modified: trunk/Scribus/doc/fr/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/fr/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/fr/CMakeLists.txt (original)
+++ trunk/Scribus/doc/fr/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,5 +1,5 @@
-ADD_SUBDIRECTORY(tutorials/short-words)
+add_subdirectory(tutorials/short-words)
#Install our html files
-FILE( GLOB SCRIBUS_DOC_FR_FILES *.html *.xml )
-INSTALL(FILES ${SCRIBUS_DOC_FR_FILES} DESTINATION ${DOCDIR}fr)
+file( GLOB SCRIBUS_DOC_FR_FILES *.html *.xml )
+install(FILES ${SCRIBUS_DOC_FR_FILES} DESTINATION ${DOCDIR}fr)
Modified: trunk/Scribus/doc/fr/tutorials/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/fr/tutorials/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/fr/tutorials/short-words/CMakeLists.txt (original)
+++ trunk/Scribus/doc/fr/tutorials/short-words/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
menu.xml
after_short_words.png
before_short_words.png
Modified: trunk/Scribus/doc/it/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/it/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/it/CMakeLists.txt (original)
+++ trunk/Scribus/doc/it/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-ADD_SUBDIRECTORY(images)
+add_subdirectory(images)
#Install our html files
-FILE( GLOB SCRIBUS_DOC_IT_FILES *.html *.xml )
-INSTALL(FILES ${SCRIBUS_DOC_IT_FILES} DESTINATION ${DOCDIR}it)
+file( GLOB SCRIBUS_DOC_IT_FILES *.html *.xml )
+install(FILES ${SCRIBUS_DOC_IT_FILES} DESTINATION ${DOCDIR}it)
Modified: trunk/Scribus/doc/it/images/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/it/images/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/it/images/CMakeLists.txt (original)
+++ trunk/Scribus/doc/it/images/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
#Install our image files
-FILE( GLOB SCRIBUS_DOC_IT_IMAGES_FILES *.jpg *.png )
+file( GLOB SCRIBUS_DOC_IT_IMAGES_FILES *.jpg *.png )
-INSTALL(FILES ${SCRIBUS_DOC_IT_IMAGES_FILES} DESTINATION ${DOCDIR}it/images)
+install(FILES ${SCRIBUS_DOC_IT_IMAGES_FILES} DESTINATION ${DOCDIR}it/images)
Modified: trunk/Scribus/doc/pl/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/pl/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/pl/CMakeLists.txt (original)
+++ trunk/Scribus/doc/pl/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1 +1 @@
-ADD_SUBDIRECTORY(tutorials/short-words)
+add_subdirectory(tutorials/short-words)
Modified: trunk/Scribus/doc/pl/tutorials/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/doc/pl/tutorials/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/doc/pl/tutorials/short-words/CMakeLists.txt (original)
+++ trunk/Scribus/doc/pl/tutorials/short-words/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
menu.xml
after_short_words.png
before_short_words.png
Modified: trunk/Scribus/resources/dicts/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/dicts/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/dicts/CMakeLists.txt (original)
+++ trunk/Scribus/resources/dicts/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
#Install our hyphenation dict files, selected from *.dic in this directory
-FILE( GLOB SCRIBUS_DICT_FILES *.dic *.txt )
-LIST(REMOVE_ITEM SCRIBUS_DICT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
-INSTALL(FILES ${SCRIBUS_DICT_FILES} DESTINATION ${SHAREDIR}dicts/hyph)
+file( GLOB SCRIBUS_DICT_FILES *.dic *.txt )
+list(REMOVE_ITEM SCRIBUS_DICT_FILES "${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt")
+install(FILES ${SCRIBUS_DICT_FILES} DESTINATION ${SHAREDIR}dicts/hyph)
Modified: trunk/Scribus/resources/editorconfig/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/editorconfig/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/editorconfig/CMakeLists.txt (original)
+++ trunk/Scribus/resources/editorconfig/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-INSTALL(FILES
+install(FILES
100_latex.tar
100_latex.xml
#sample.xml
Modified: trunk/Scribus/resources/iconsets/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/iconsets/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/iconsets/CMakeLists.txt (original)
+++ trunk/Scribus/resources/iconsets/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
@@ -8,64 +8,64 @@
#Install our 1.5.0 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_0_UNSORTED 1_5_0/*.jpg 1_5_0/*.png 1_5_0/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_UNSORTED} DESTINATION ${ICONDIR}/1_5_0/)
+file( GLOB SCRIBUS_ICONS_1_5_0_UNSORTED 1_5_0/*.jpg 1_5_0/*.png 1_5_0/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_0_UNSORTED} DESTINATION ${ICONDIR}/1_5_0/)
#Install our 16x16 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_0_10 1_5_0/10/*.jpg 1_5_0/10/*.png 1_5_0/10/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_10} DESTINATION ${ICONDIR}/1_5_0/10)
+file( GLOB SCRIBUS_ICONS_1_5_0_10 1_5_0/10/*.jpg 1_5_0/10/*.png 1_5_0/10/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_0_10} DESTINATION ${ICONDIR}/1_5_0/10)
#Install our 16x16 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_0_16 1_5_0/16/*.jpg 1_5_0/16/*.png 1_5_0/16/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_16} DESTINATION ${ICONDIR}/1_5_0/16)
+file( GLOB SCRIBUS_ICONS_1_5_0_16 1_5_0/16/*.jpg 1_5_0/16/*.png 1_5_0/16/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_0_16} DESTINATION ${ICONDIR}/1_5_0/16)
#Install our 22x22 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_0_22 1_5_0/22/*.jpg 1_5_0/22/*.png 1_5_0/22/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_22} DESTINATION ${ICONDIR}/1_5_0/22)
+file( GLOB SCRIBUS_ICONS_1_5_0_22 1_5_0/22/*.jpg 1_5_0/22/*.png 1_5_0/22/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_0_22} DESTINATION ${ICONDIR}/1_5_0/22)
#Install our 32x32 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_0_32 1_5_0/32/*.jpg 1_5_0/32/*.png 1_5_0/32/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_32} DESTINATION ${ICONDIR}/1_5_0/32)
+file( GLOB SCRIBUS_ICONS_1_5_0_32 1_5_0/32/*.jpg 1_5_0/32/*.png 1_5_0/32/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_0_32} DESTINATION ${ICONDIR}/1_5_0/32)
#Install our stylesheet icons
-FILE( GLOB SCRIBUS_ICONS_1_5_0_STYLE 1_5_0/stylesheet/*.png )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_0_STYLE} DESTINATION ${ICONDIR}/1_5_0/stylesheet)
+file( GLOB SCRIBUS_ICONS_1_5_0_STYLE 1_5_0/stylesheet/*.png )
+install(FILES ${SCRIBUS_ICONS_1_5_0_STYLE} DESTINATION ${ICONDIR}/1_5_0/stylesheet)
#Install our XML
-FILE( GLOB SCRIBUS_XML_1_5_0 1_5_0/*.xml )
-INSTALL(FILES ${SCRIBUS_XML_1_5_0} DESTINATION ${ICONDIR})
+file( GLOB SCRIBUS_XML_1_5_0 1_5_0/*.xml )
+install(FILES ${SCRIBUS_XML_1_5_0} DESTINATION ${ICONDIR})
##################
#Install our 1.5.1 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_1_UNSORTED 1_5_1/*.jpg 1_5_1/*.png 1_5_1/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_UNSORTED} DESTINATION ${ICONDIR}/1_5_1/)
+file( GLOB SCRIBUS_ICONS_1_5_1_UNSORTED 1_5_1/*.jpg 1_5_1/*.png 1_5_1/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_1_UNSORTED} DESTINATION ${ICONDIR}/1_5_1/)
#Install our 16x16 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_1_10 1_5_1/10/*.jpg 1_5_1/10/*.png 1_5_1/10/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_10} DESTINATION ${ICONDIR}/1_5_1/10)
+file( GLOB SCRIBUS_ICONS_1_5_1_10 1_5_1/10/*.jpg 1_5_1/10/*.png 1_5_1/10/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_1_10} DESTINATION ${ICONDIR}/1_5_1/10)
#Install our 16x16 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_1_16 1_5_1/16/*.jpg 1_5_1/16/*.png 1_5_1/16/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_16} DESTINATION ${ICONDIR}/1_5_1/16)
+file( GLOB SCRIBUS_ICONS_1_5_1_16 1_5_1/16/*.jpg 1_5_1/16/*.png 1_5_1/16/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_1_16} DESTINATION ${ICONDIR}/1_5_1/16)
#Install our 22x22 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_1_22 1_5_1/22/*.jpg 1_5_1/22/*.png 1_5_1/22/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_22} DESTINATION ${ICONDIR}/1_5_1/22)
+file( GLOB SCRIBUS_ICONS_1_5_1_22 1_5_1/22/*.jpg 1_5_1/22/*.png 1_5_1/22/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_1_22} DESTINATION ${ICONDIR}/1_5_1/22)
#Install our 32x32 icons
-FILE( GLOB SCRIBUS_ICONS_1_5_1_32 1_5_1/32/*.jpg 1_5_1/32/*.png 1_5_1/32/*.xpm )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_32} DESTINATION ${ICONDIR}/1_5_1/32)
+file( GLOB SCRIBUS_ICONS_1_5_1_32 1_5_1/32/*.jpg 1_5_1/32/*.png 1_5_1/32/*.xpm )
+install(FILES ${SCRIBUS_ICONS_1_5_1_32} DESTINATION ${ICONDIR}/1_5_1/32)
#Install our stylesheet icons
-FILE( GLOB SCRIBUS_ICONS_1_5_1_STYLE 1_5_1/stylesheet/*.png )
-INSTALL(FILES ${SCRIBUS_ICONS_1_5_1_STYLE} DESTINATION ${ICONDIR}/1_5_1/stylesheet)
+file( GLOB SCRIBUS_ICONS_1_5_1_STYLE 1_5_1/stylesheet/*.png )
+install(FILES ${SCRIBUS_ICONS_1_5_1_STYLE} DESTINATION ${ICONDIR}/1_5_1/stylesheet)
#Install our XML
-FILE( GLOB SCRIBUS_XML_1_5_1 1_5_1/*.xml )
-INSTALL(FILES ${SCRIBUS_XML_1_5_1} DESTINATION ${ICONDIR})
+file( GLOB SCRIBUS_XML_1_5_1 1_5_1/*.xml )
+install(FILES ${SCRIBUS_XML_1_5_1} DESTINATION ${ICONDIR})
##################
Modified: trunk/Scribus/resources/keysets/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/keysets/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/keysets/CMakeLists.txt (original)
+++ trunk/Scribus/resources/keysets/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
icalamus.xml
pageplusx3.xml
pagestream.xml
Modified: trunk/Scribus/resources/loremipsum/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/loremipsum/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/loremipsum/CMakeLists.txt (original)
+++ trunk/Scribus/resources/loremipsum/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,7 +1,7 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
#Install our lorem ipsum sample files, selected from *.xml in this directory
-FILE( GLOB SCRIBUS_LOREM_FILES *.xml )
-INSTALL(FILES ${SCRIBUS_LOREM_FILES} DESTINATION ${SHAREDIR}loremipsum)
+file( GLOB SCRIBUS_LOREM_FILES *.xml )
+install(FILES ${SCRIBUS_LOREM_FILES} DESTINATION ${SHAREDIR}loremipsum)
Modified: trunk/Scribus/resources/manpages/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/manpages/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/manpages/CMakeLists.txt (original)
+++ trunk/Scribus/resources/manpages/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,20 +1,20 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
scribus.1
DESTINATION ${CMAKE_INSTALL_MANDIR}/man1
RENAME scribus${TAG_VERSION}.1
)
-INSTALL(FILES
+install(FILES
scribus.1.de
DESTINATION ${CMAKE_INSTALL_MANDIR}/de/man1
RENAME scribus${TAG_VERSION}.1
)
-INSTALL(FILES
+install(FILES
scribus.1.pl
DESTINATION ${CMAKE_INSTALL_MANDIR}/pl/man1
RENAME scribus${TAG_VERSION}.1
Modified: trunk/Scribus/resources/profiles/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/profiles/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/profiles/CMakeLists.txt (original)
+++ trunk/Scribus/resources/profiles/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
GenericCMYK.icm
GenericCMYK.txt
Readme
Modified: trunk/Scribus/resources/swatches/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/swatches/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/swatches/CMakeLists.txt (original)
+++ trunk/Scribus/resources/swatches/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,16 +1,16 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-FILE( GLOB GIMP_STYLE_PALETTES *.gpl )
-FILE( GLOB XML_PALETTES *.xml )
-FILE( GLOB EPS_PALETTES *.eps )
-FILE( GLOB RTF_LICENSES *.rtf )
-FILE( GLOB SBZ_PALETTES *.sbz )
+file( GLOB GIMP_STYLE_PALETTES *.gpl )
+file( GLOB XML_PALETTES *.xml )
+file( GLOB EPS_PALETTES *.eps )
+file( GLOB RTF_LICENSES *.rtf )
+file( GLOB SBZ_PALETTES *.sbz )
#Avoid CMakeLists.txt
-SET(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
+set(TXT_LICENSES "${CMAKE_CURRENT_SOURCE_DIR}/COPYING_RESENE.txt" "${CMAKE_CURRENT_SOURCE_DIR}/Japanese_Traditional_README.txt")
-INSTALL(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES} ${SBZ_PALETTES}
+install(FILES ${GIMP_STYLE_PALETTES} ${XML_PALETTES} ${EPS_PALETTES} ${RTF_LICENSES} ${TXT_LICENSES} ${SBZ_PALETTES}
DESTINATION ${SHAREDIR}swatches
)
Modified: trunk/Scribus/resources/templates/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/templates/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/templates/CMakeLists.txt (original)
+++ trunk/Scribus/resources/templates/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,14 +1,14 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
# Gentoo has an option for no templates. Let's make the ebuild simpler and open up the option to others, but leave as a default for us. Make the directory in any case as our source will look for it.
-IF (WANT_NOTEMPLATES)
- INSTALL(CODE "FILE(MAKE_DIRECTORY ${ENV}${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR})")
-ELSE (WANT_NOTEMPLATES)
-
-INSTALL(FILES
+if (WANT_NOTEMPLATES)
+ install(CODE "file(MAKE_DIRECTORY ${ENV}${CMAKE_INSTALL_PREFIX}/${TEMPLATEDIR})")
+else (WANT_NOTEMPLATES)
+
+install(FILES
template.xml
template.ca.xml
template.de.xml
@@ -18,7 +18,7 @@
DESTINATION ${TEMPLATEDIR}
)
-INSTALL(FILES
+install(FILES
br1/br1.png
br1/br1tn.png
br1/map.jpg
@@ -26,7 +26,7 @@
DESTINATION ${TEMPLATEDIR}br1
)
-INSTALL(FILES
+install(FILES
nl1/kites.jpg
nl1/nl1.png
nl1/nl1tn.png
@@ -34,7 +34,7 @@
DESTINATION ${TEMPLATEDIR}nl1
)
-INSTALL(FILES
+install(FILES
nl2/flowers.jpg
nl2/nl2.png
nl2/nl2tn.png
@@ -42,7 +42,7 @@
DESTINATION ${TEMPLATEDIR}nl2
)
-INSTALL(FILES
+install(FILES
textbased/an_image.jpg
textbased/author.jpg
textbased/textbased.png
@@ -51,305 +51,305 @@
DESTINATION ${TEMPLATEDIR}textbased
)
-INSTALL(FILES
+install(FILES
pres_backgr_1/blue_orange_vector.sla.gz
pres_backgr_1/blue_orange_vectortn.png
pres_backgr_1/blue_orange_vector.png
DESTINATION ${TEMPLATEDIR}pres_backgr_1
)
-INSTALL(FILES
+install(FILES
pres_backgr_2/flood_light.sla.gz
pres_backgr_2/flood_lighttn.png
pres_backgr_2/flood_light.png
DESTINATION ${TEMPLATEDIR}pres_backgr_2
)
-INSTALL(FILES
+install(FILES
pres_backgr_3/glass_ripples.sla.gz
pres_backgr_3/glass_ripplestn.png
pres_backgr_3/glass_ripples.png
DESTINATION ${TEMPLATEDIR}pres_backgr_3
)
-INSTALL(FILES
+install(FILES
pres_backgr_4/bokeh.sla.gz
pres_backgr_4/Bokehtn.png
pres_backgr_4/Bokeh.png
DESTINATION ${TEMPLATEDIR}pres_backgr_4
)
-INSTALL(FILES
+install(FILES
cc/Cheat_Cube.png
cc/Cheat_Cubetn.png
cc/Cheat_Cube.sla.gz
DESTINATION ${TEMPLATEDIR}cc
)
-INSTALL(FILES
+install(FILES
mc/menu_template1.png
mc/menu_template1tn.png
mc/menu_template1.sla.gz
DESTINATION ${TEMPLATEDIR}mc
)
-INSTALL(FILES
+install(FILES
cover1/cover1.png
cover1/cover1tn.png
cover1/cover1.sla.gz
DESTINATION ${TEMPLATEDIR}cover1
)
-INSTALL(FILES
+install(FILES
cover2/cover2.png
cover2/cover2tn.png
cover2/cover2.sla.gz
DESTINATION ${TEMPLATEDIR}cover2
)
-INSTALL(FILES
+install(FILES
cover3/cover3.png
cover3/cover3tn.png
cover3/cover3.sla.gz
DESTINATION ${TEMPLATEDIR}cover3
)
-INSTALL(FILES
+install(FILES
cover4/cover4.png
cover4/cover4tn.png
cover4/cover4.sla.gz
DESTINATION ${TEMPLATEDIR}cover4
)
-INSTALL(FILES
+install(FILES
cover5/cover5.png
cover5/cover5tn.png
cover5/cover5.sla.gz
DESTINATION ${TEMPLATEDIR}cover5
)
-INSTALL(FILES
+install(FILES
buscard1/Business_Card_1.png
buscard1/Business_Card_1tn.png
buscard1/buscard1.sla.gz
DESTINATION ${TEMPLATEDIR}buscard1
)
-INSTALL(FILES
+install(FILES
buscard2/Business_Card_2.png
buscard2/Business_Card_2tn.png
buscard2/buscard2.sla.gz
DESTINATION ${TEMPLATEDIR}buscard2
)
-INSTALL(FILES
+install(FILES
buscard3/Business_Card_3.png
buscard3/Business_Card_3tn.png
buscard3/buscard3.sla.gz
DESTINATION ${TEMPLATEDIR}buscard3
)
-INSTALL(FILES
+install(FILES
buscard4/Business_Card_4.png
buscard4/Business_Card_4tn.png
buscard4/buscard4.sla.gz
DESTINATION ${TEMPLATEDIR}buscard4
)
-INSTALL(FILES
+install(FILES
buscard5/Business_Card_5.png
buscard5/Business_Card_5tn.png
buscard5/buscard5.sla.gz
DESTINATION ${TEMPLATEDIR}buscard5
)
-INSTALL(FILES
+install(FILES
buscard6/Business_Card_6.png
buscard6/Business_Card_6tn.png
buscard6/buscard6.sla.gz
DESTINATION ${TEMPLATEDIR}buscard6
)
-INSTALL(FILES
+install(FILES
buscard7/Business_Card_7.png
buscard7/Business_Card_7tn.png
buscard7/buscard7.sla.gz
DESTINATION ${TEMPLATEDIR}buscard7
)
-INSTALL(FILES
+install(FILES
buscard8/Business_Card_8.png
buscard8/Business_Card_8tn.png
buscard8/buscard8.sla.gz
DESTINATION ${TEMPLATEDIR}buscard8
)
-INSTALL(FILES
+install(FILES
buscard9/Business_Card_9.png
buscard9/Business_Card_9tn.png
buscard9/buscard9.sla.gz
DESTINATION ${TEMPLATEDIR}buscard9
)
-INSTALL(FILES
+install(FILES
buscard10/Business_Card_10.png
buscard10/Business_Card_10tn.png
buscard10/buscard10.sla.gz
DESTINATION ${TEMPLATEDIR}buscard10
)
-INSTALL(FILES
+install(FILES
buscard11/Business_Card_11.png
buscard11/Business_Card_11tn.png
buscard11/buscard11.sla.gz
DESTINATION ${TEMPLATEDIR}buscard11
)
-INSTALL(FILES
+install(FILES
grid_br_a4_l/Brochure_Grid_A4_L.sla.gz
grid_br_a4_l/Brochure_Grid_A4_Ltn.png
grid_br_a4_l/Brochure_Grid_A4_L.png
DESTINATION ${TEMPLATEDIR}grid_br_a4_l
)
-INSTALL(FILES
+install(FILES
grid_br_a4_p/Brochure_Grid_A4_P.sla.gz
grid_br_a4_p/Brochure_Grid_A4_Ptn.png
grid_br_a4_p/Brochure_Grid_A4_P.png
DESTINATION ${TEMPLATEDIR}grid_br_a4_p
)
-INSTALL(FILES
+install(FILES
grid_br_975x85in_l/Brochure_Grid_975x85in_L.sla.gz
grid_br_975x85in_l/Brochure_Grid_975x85_in_Ltn.png
grid_br_975x85in_l/Brochure_Grid_975x85_in_L.png
DESTINATION ${TEMPLATEDIR}grid_br_975x85in_l
)
-INSTALL(FILES
+install(FILES
grid_br_975x85_p/Brochure_Grid_975x85in_P.sla.gz
grid_br_975x85_p/Brochure_Grid_975x85_in_Ptn.png
grid_br_975x85_p/Brochure_Grid_975x85_in_P.png
DESTINATION ${TEMPLATEDIR}grid_br_975x85_p
)
-INSTALL(FILES
+install(FILES
grid_br_375x85_p/Brochure_Grid_375x85in_P.sla.gz
grid_br_375x85_p/Brochure_Grid_375x85_in_Ptn.png
grid_br_375x85_p/Brochure_Grid_375x85_in_P.png
DESTINATION ${TEMPLATEDIR}grid_br_375x85_p
)
-INSTALL(FILES
+install(FILES
grid_br_375x85_l/Brochure_Grid_375x85in_L.sla.gz
grid_br_375x85_l/Brochure_Grid_375x85_in_Landscapetn.png
grid_br_375x85_l/Brochure_Grid_375x85_in_Landscape.png
DESTINATION ${TEMPLATEDIR}grid_br_375x85_l
)
-INSTALL(FILES
+install(FILES
grid_br_100x210_p/Brochure_Grid_100x210_P.sla.gz
grid_br_100x210_p/Brochure_Grid_100x210_Ptn.png
grid_br_100x210_p/Brochure_Grid_100x210_P.png
DESTINATION ${TEMPLATEDIR}grid_br_100x210_p
)
-INSTALL(FILES
+install(FILES
grid_br_100x210_l/Brochure_Grid_100x210_L.sla.gz
grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscapetn.png
grid_br_100x210_l/Brochure_Grid_100x210_mm_Landscape.png
DESTINATION ${TEMPLATEDIR}grid_br_100x210_l
)
-INSTALL(FILES
+install(FILES
grid_br_55x86in_p/Brochure_Grid_55x85in_P.sla.gz
grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoittn.png
grid_br_55x86in_p/Brochure_Grid_55x85in_Portraoit.png
DESTINATION ${TEMPLATEDIR}grid_br_55x86in_p
)
-INSTALL(FILES
+install(FILES
grid_br_55x85in_l/Brochure_Grid_55x85in_L.sla.gz
grid_br_55x85in_l/Brochure_Grid_55x85_in_Ltn.png
grid_br_55x85in_l/Brochure_Grid_55x85_in_L.png
DESTINATION ${TEMPLATEDIR}grid_br_55x85in_l
)
-INSTALL(FILES
+install(FILES
grid_poster_a3/Poster_Grid_A3.sla.gz
grid_poster_a3/Poster_Grid_A3tn.png
grid_poster_a3/Poster_Grid_A3.png
DESTINATION ${TEMPLATEDIR}grid_poster_a3
)
-INSTALL(FILES
+install(FILES
grid_poster_a2/Poster_Grid_A2.sla.gz
grid_poster_a2/Poster_Grid_A2tn.png
grid_poster_a2/Poster_Grid_A2.png
DESTINATION ${TEMPLATEDIR}grid_poster_a2
)
-INSTALL(FILES
+install(FILES
grid_poster_a1/Poster_Grid_A1.sla.gz
grid_poster_a1/Poster_Grid_A1tn.png
grid_poster_a1/Poster_Grid_A1.png
DESTINATION ${TEMPLATEDIR}grid_poster_a1
)
-INSTALL(FILES
+install(FILES
grid_poster_a0/Poster_Grid_A0.sla.gz
grid_poster_a0/Poster_Grid_A0tn.png
grid_poster_a0/Poster_Grid_A0.png
DESTINATION ${TEMPLATEDIR}grid_poster_a0
)
-INSTALL(FILES
+install(FILES
grid_br_usl_p/Brochure_Grid_USL_P.sla.gz
grid_br_usl_p/Brochure_Grid_USL_Ptn.png
grid_br_usl_p/Brochure_Grid_USL_P.png
DESTINATION ${TEMPLATEDIR}grid_poster_a0
)
-INSTALL(FILES
+install(FILES
grid_br_usl_l/Brochure_Grid_USL_L.sla.gz
grid_br_usl_l/Brochure_Grid_USL_Ltn.png
grid_br_usl_l/Brochure_Grid_USL_L.png
DESTINATION ${TEMPLATEDIR}grid_br_usl_l
)
-INSTALL(FILES
+install(FILES
grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.sla.gz
grid_br_dinl_p/Brochure_Grid_DIN_LANG_Ptn.png
grid_br_dinl_p/Brochure_Grid_DIN_LANG_P.png
DESTINATION ${TEMPLATEDIR}grid_br_dinl_p
)
-INSTALL(FILES
+install(FILES
grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.sla.gz
grid_br_dinl_l/Brochure_Grid_DIN_LANG_Ltn.png
grid_br_dinl_l/Brochure_Grid_DIN_LANG_L.png
DESTINATION ${TEMPLATEDIR}grid_br_dinl_l
)
-INSTALL(FILES
+install(FILES
grid_br_a5_p/Brochure_Grid_A5_P.sla.gz
grid_br_a5_p/Brochure_Grid_A5_Portraittn.png
grid_br_a5_p/Brochure_Grid_A5_Portrait.png
DESTINATION ${TEMPLATEDIR}grid_br_a5_p
)
-INSTALL(FILES
+install(FILES
grid_br_a5_l/Brochure_Grid_A5_L.sla.gz
grid_br_a5_l/Brochure_Grid_A5_Ltn.png
grid_br_a5_l/Brochure_Grid_A5_L.png
DESTINATION ${TEMPLATEDIR}grid_br_a5_l
)
-INSTALL(FILES
+install(FILES
buscard_coll/business_card_collection.sla.gz
buscard_coll/Business_Card_Collectiontn.png
buscard_coll/Business_Card_Collection.png
DESTINATION ${TEMPLATEDIR}buscard_coll
)
-ENDIF (WANT_NOTEMPLATES)
+endif (WANT_NOTEMPLATES)
Modified: trunk/Scribus/resources/translations/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/resources/translations/CMakeLists.txt
==============================================================================
--- trunk/Scribus/resources/translations/CMakeLists.txt (original)
+++ trunk/Scribus/resources/translations/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,53 +1,53 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-SET(LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE})
+set(LRELEASE_EXECUTABLE ${Qt5_LRELEASE_EXECUTABLE})
#Install our qm files, selected from *.qm in this directory
-FILE( GLOB SCRIBUS_TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.ts )
-MESSAGE(STATUS ${CMAKE_CURRENT_SOURCE_DIR})
+file( GLOB SCRIBUS_TS_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.ts )
+message(STATUS ${CMAKE_CURRENT_SOURCE_DIR})
#Bit of a hack, preprocess all the filenames to generate our language string, needed for -DWANT_GUI_LANG=en_GB;de_DE , etc
-FOREACH(TS_FILEPATH ${SCRIBUS_TS_FILES})
- GET_FILENAME_COMPONENT(TS_FILENAME ${TS_FILEPATH} NAME)
- STRING(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
- STRING(REPLACE "." "" LANGSTR ${LANGSTR})
- SET(QM_LANGS ${QM_LANGS} ${LANGSTR})
-ENDFOREACH(TS_FILEPATH)
+foreach(TS_FILEPATH ${SCRIBUS_TS_FILES})
+ get_filename_component(TS_FILENAME ${TS_FILEPATH} NAME)
+ string(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
+ string(REPLACE "." "" LANGSTR ${LANGSTR})
+ set(QM_LANGS ${QM_LANGS} ${LANGSTR})
+endforeach(TS_FILEPATH)
-MESSAGE(STATUS "The following GUI languages will be installed: ${WANT_GUI_LANG}")
+message(STATUS "The following GUI languages will be installed: ${WANT_GUI_LANG}")
#If the user specified WANT_GUI_LANG, then we only create build/install targets for those languages
-IF(WANT_GUI_LANG)
- FOREACH(TS_FILEPATH ${SCRIBUS_TS_FILES})
- GET_FILENAME_COMPONENT(TS_FILENAME ${TS_FILEPATH} NAME)
- STRING(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
- STRING(REPLACE "." "" LANGSTR ${LANGSTR})
- FOREACH(WANTED_LANG ${WANT_GUI_LANG})
- IF(LANGSTR STREQUAL WANTED_LANG)
- #MESSAGE(STATUS "You want to install ${LANGSTR}:${WANTED_LANG}")
- SET(QM_FILENAME "scribus.${LANGSTR}.qm")
- ADD_CUSTOM_TARGET("release_ts_${LANGSTR}" ALL
+if(WANT_GUI_LANG)
+ foreach(TS_FILEPATH ${SCRIBUS_TS_FILES})
+ get_filename_component(TS_FILENAME ${TS_FILEPATH} NAME)
+ string(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
+ string(REPLACE "." "" LANGSTR ${LANGSTR})
+ foreach(WANTED_LANG ${WANT_GUI_LANG})
+ if(LANGSTR STREQUAL WANTED_LANG)
+ #message(STATUS "You want to install ${LANGSTR}:${WANTED_LANG}")
+ set(QM_FILENAME "scribus.${LANGSTR}.qm")
+ add_custom_target("release_ts_${LANGSTR}" ALL
COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
DEPENDS ${TS_FILEPATH}
)
- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)
- ENDIF(LANGSTR STREQUAL WANTED_LANG)
- ENDFOREACH(WANTED_LANG)
- ENDFOREACH(TS_FILEPATH)
-ELSE(WANT_GUI_LANG)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)
+ endif(LANGSTR STREQUAL WANTED_LANG)
+ endforeach(WANTED_LANG)
+ endforeach(TS_FILEPATH)
+else(WANT_GUI_LANG)
#Just install all of them
- FOREACH(TS_FILEPATH ${SCRIBUS_TS_FILES})
- GET_FILENAME_COMPONENT(TS_FILENAME ${TS_FILEPATH} NAME)
- STRING(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
- STRING(REPLACE "." "" LANGSTR ${LANGSTR})
- SET(QM_FILENAME "scribus.${LANGSTR}.qm")
- ADD_CUSTOM_TARGET("release_ts_${LANGSTR}" ALL
+ foreach(TS_FILEPATH ${SCRIBUS_TS_FILES})
+ get_filename_component(TS_FILENAME ${TS_FILEPATH} NAME)
+ string(REGEX MATCH "\\.([0-9a-zA-Z_]*)\\." LANGSTR ${TS_FILENAME})
+ string(REPLACE "." "" LANGSTR ${LANGSTR})
+ set(QM_FILENAME "scribus.${LANGSTR}.qm")
+ add_custom_target("release_ts_${LANGSTR}" ALL
COMMAND ${LRELEASE_EXECUTABLE} ${TS_FILEPATH} -silent -qm ${QM_FILENAME}
DEPENDS ${TS_FILEPATH}
)
- INSTALL(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)
- ENDFOREACH(TS_FILEPATH)
-ENDIF(WANT_GUI_LANG)
+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${QM_FILENAME}" DESTINATION ${SHAREDIR}/translations)
+ endforeach(TS_FILEPATH)
+endif(WANT_GUI_LANG)
Modified: trunk/Scribus/scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,13 +1,13 @@
#For those that want it, show the SVN version in the About dialog
-IF (WANT_SVNVERSION)
- ADD_DEFINITIONS(-DHAVE_SVNVERSION)
- MESSAGE(STATUS "SVN Version requested in About dialog")
+if (WANT_SVNVERSION)
+ add_definitions(-DHAVE_SVNVERSION)
+ message(STATUS "SVN Version requested in About dialog")
# a custom target that is always built
- IF (NOT CMAKE_VERSION VERSION_LESS "3.2.0")
+ if (NOT CMAKE_VERSION VERSION_LESS "3.2.0")
add_custom_target(svnheader ALL COMMAND ${CMAKE_COMMAND} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -P ${CMAKE_MODULE_PATH}/getsvn.cmake BYPRODUCTS ${CMAKE_CURRENT_BINARY_DIR}/svnversion.h)
- ELSE ()
+ else ()
add_custom_target(svnheader ALL DEPENDS svn_header ) # svn_header is nothing more than a unique string
# creates svnheader.h using cmake script
@@ -17,59 +17,59 @@
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/svnversion.h
PROPERTIES GENERATED TRUE
HEADER_FILE_ONLY TRUE)
- ENDIF ()
-ENDIF ()
-
-IF(WIN32)
- ADD_DEFINITIONS(-DQT_DLL)
-ENDIF()
-
-ADD_SUBDIRECTORY(dtd)
-ADD_SUBDIRECTORY(colormgmt)
-ADD_SUBDIRECTORY(desaxe)
-ADD_SUBDIRECTORY(fonts)
-ADD_SUBDIRECTORY(styles)
-ADD_SUBDIRECTORY(text)
-ADD_SUBDIRECTORY(ui/qml)
-IF(WITH_TESTS)
- ADD_SUBDIRECTORY(tests)
-ENDIF()
-ADD_SUBDIRECTORY(unicodemap)
-IF (WANT_DESIGNER)
- ADD_SUBDIRECTORY(designer)
-ENDIF ()
-ADD_SUBDIRECTORY(third_party)
-
-IF(HAVE_OSG)
- SET(SCRIBUS_OSG_UI_SRC
+ endif ()
+endif ()
+
+if(WIN32)
+ add_definitions(-DQT_DLL)
+endif()
+
+add_subdirectory(dtd)
+add_subdirectory(colormgmt)
+add_subdirectory(desaxe)
+add_subdirectory(fonts)
+add_subdirectory(styles)
+add_subdirectory(text)
+add_subdirectory(ui/qml)
+if(WITH_TESTS)
+ add_subdirectory(tests)
+endif()
+add_subdirectory(unicodemap)
+if (WANT_DESIGNER)
+ add_subdirectory(designer)
+endif ()
+add_subdirectory(third_party)
+
+if(HAVE_OSG)
+ set(SCRIBUS_OSG_UI_SRC
ui/osgeditor.ui
)
- SET(SCRIBUS_OSG_CLASS
+ set(SCRIBUS_OSG_CLASS
ui/AdapterWidget.h
ui/osgeditor.h
pageitem_osgframe.h
)
- SET(SCRIBUS_OSG_SRC
+ set(SCRIBUS_OSG_SRC
ui/AdapterWidget.cpp
ui/osgeditor.cpp
pageitem_osgframe.cpp
)
-ENDIF ()
-
-IF (GMAGICK_FOUND)
- SET(SCRIBUS_GMAGICK_SRC imagedataloaders/scimgdataloader_gmagick.cpp)
-ELSE()
- SET(SCRIBUS_GMAGICK_SRC)
-ENDIF()
+endif ()
+
+if (GMAGICK_FOUND)
+ set(SCRIBUS_GMAGICK_SRC imagedataloaders/scimgdataloader_gmagick.cpp)
+else()
+ set(SCRIBUS_GMAGICK_SRC)
+endif()
# We setup something like a group to gather setter related stuff
# because it could expand into a huge amount of files at some point.
-SET(SCRIBUS_ITEMSETTERS_UI_SRC
+set(SCRIBUS_ITEMSETTERS_UI_SRC
ui/positionsetter.ui
ui/rotationsetter.ui
)
-SET(SCRIBUS_ITEMSETTERS_CLASS
+set(SCRIBUS_ITEMSETTERS_CLASS
openpalettemanager.h
openpalettemodel.h
pageitemsettersmanager.h
@@ -79,7 +79,7 @@
ui/pageitemrotationsetter.h
)
-SET(SCRIBUS_ITEMSETTERS_SRC
+set(SCRIBUS_ITEMSETTERS_SRC
openpalettemanager.cpp
openpalettemodel.cpp
pageitemsettersmanager.cpp
@@ -90,7 +90,7 @@
ui/pageitemrotationsetter.cpp
)
-SET(SCRIBUS_UI_SRC
+set(SCRIBUS_UI_SRC
ui/aboutplugins.ui
ui/aligndistribute.ui
ui/annot.ui
@@ -209,7 +209,7 @@
${SCRIBUS_OSG_UI_SRC}
)
-SET(SCRIBUS_MOC_CLASSES
+set(SCRIBUS_MOC_CLASSES
actionmanager.h
appmodehelper.h
canvas.h
@@ -539,7 +539,7 @@
${SCRIBUS_OSG_CLASS}
)
-SET(SCRIBUS_SOURCES
+set(SCRIBUS_SOURCES
actionmanager.cpp
appmodehelper.cpp
canvas.cpp
@@ -1011,29 +1011,29 @@
${SCRIBUS_GMAGICK_SRC}
)
-IF(NOT HAVE_HYPHEN)
- INCLUDE_DIRECTORIES(third_party/hyphen)
- SET(SCRIBUS_SOURCES
+if(NOT HAVE_HYPHEN)
+ include_directories(third_party/hyphen)
+ set(SCRIBUS_SOURCES
${SCRIBUS_SOURCES}
third_party/hyphen/hnjalloc.c
third_party/hyphen/hyphen.c
)
-ENDIF()
-
-
-
-IF(WIN32)
- SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h)
- SET(SCRIBUS_WIN32_ONLY_SOURCES
+endif()
+
+
+
+if(WIN32)
+ set(SCRIBUS_MOC_WIN32_ONLY_CLASSES scprintengine_gdi.h)
+ set(SCRIBUS_WIN32_ONLY_SOURCES
scpainterex_cairo.cpp
scprintengine_gdi.cpp
)
- SET(SCRIBUS_MAIN_CPP main_win32.cpp)
-ELSE()
- SET(SCRIBUS_MOC_WIN32_ONLY_CLASSES)
- SET(SCRIBUS_WIN32_ONLY_SOURCES)
- SET(SCRIBUS_MAIN_CPP main.cpp)
-ENDIF()
+ set(SCRIBUS_MAIN_CPP main_win32.cpp)
+else()
+ set(SCRIBUS_MOC_WIN32_ONLY_CLASSES)
+ set(SCRIBUS_WIN32_ONLY_SOURCES)
+ set(SCRIBUS_MAIN_CPP main.cpp)
+endif()
QT5_WRAP_UI(SCRIBUS_UI_SOURCES ${SCRIBUS_UI_SRC} )
@@ -1042,7 +1042,7 @@
${SCRIBUS_MOC_WIN32_ONLY_CLASSES}
)
-LINK_DIRECTORIES(
+link_directories(
${CMAKE_CURRENT_BINARY_DIR}/colormgmt
${CMAKE_CURRENT_BINARY_DIR}/desaxe
${CMAKE_CURRENT_BINARY_DIR}/fonts
@@ -1054,87 +1054,87 @@
${CMAKE_CURRENT_BINARY_DIR}/third_party/zip
)
-IF(WITH_TESTS)
- LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/tests )
-ENDIF()
-
-IF(HAVE_OSG)
- LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/third_party/prc )
-ENDIF ()
-
-IF(HAVE_BOOST)
- LINK_DIRECTORIES( ${CMAKE_CURRENT_BINARY_DIR}/third_party/lib2geom )
-ENDIF ()
-
-SET(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
-SET(SCRIBUS_TEXT_LIB "scribus_text_lib")
-IF(WITH_TESTS)
- SET(SCRIBUS_TESTS_LIB "scribus_tests_lib")
-ELSE()
- SET(SCRIBUS_TESTS_LIB "")
-ENDIF()
-SET(SCRIBUS_STYLES_LIB "scribus_styles_lib")
-SET(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
-SET(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
-IF(HAVE_OSG)
- SET(SCRIBUS_PRC_LIB "scribus_prc_lib")
-ENDIF ()
-IF(HAVE_BOOST)
- SET(SCRIBUS_2GEOM_LIB "scribus_2geom_lib")
-ENDIF ()
-SET(SCRIBUS_WPG_LIB "scribus_wpg_lib")
-SET(SCRIBUS_PGF_LIB "scribus_pgf_lib")
-SET(SCRIBUS_ZIP_LIB "scribus_zip_lib")
-SET(SCRIBUS_RTF_LIB "scribus_rtf_lib")
-
-INCLUDE_DIRECTORIES(
+if(WITH_TESTS)
+ link_directories( ${CMAKE_CURRENT_BINARY_DIR}/tests )
+endif()
+
+if(HAVE_OSG)
+ link_directories( ${CMAKE_CURRENT_BINARY_DIR}/third_party/prc )
+endif ()
+
+if(HAVE_BOOST)
+ link_directories( ${CMAKE_CURRENT_BINARY_DIR}/third_party/lib2geom )
+endif ()
+
+set(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
+set(SCRIBUS_TEXT_LIB "scribus_text_lib")
+if(WITH_TESTS)
+ set(SCRIBUS_TESTS_LIB "scribus_tests_lib")
+else()
+ set(SCRIBUS_TESTS_LIB "")
+endif()
+set(SCRIBUS_STYLES_LIB "scribus_styles_lib")
+set(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
+set(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
+if(HAVE_OSG)
+ set(SCRIBUS_PRC_LIB "scribus_prc_lib")
+endif ()
+if(HAVE_BOOST)
+ set(SCRIBUS_2GEOM_LIB "scribus_2geom_lib")
+endif ()
+set(SCRIBUS_WPG_LIB "scribus_wpg_lib")
+set(SCRIBUS_PGF_LIB "scribus_pgf_lib")
+set(SCRIBUS_ZIP_LIB "scribus_zip_lib")
+set(SCRIBUS_RTF_LIB "scribus_rtf_lib")
+
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_SOURCE_DIR}
${FREETYPE_INCLUDE_DIRS}
)
-IF (GMAGICK_FOUND)
- MESSAGE(STATUS "GMAGICK: Libs: ${GMAGICK_LDFLAGS}, Inc: ${GMAGICK_INCLUDE_DIRS}, Ldflags: ${GMAGICK_LDFLAGS}")
- INCLUDE_DIRECTORIES(
+if (GMAGICK_FOUND)
+ message(STATUS "GMAGICK: Libs: ${GMAGICK_LDFLAGS}, Inc: ${GMAGICK_INCLUDE_DIRS}, Ldflags: ${GMAGICK_LDFLAGS}")
+ include_directories(
BEFORE ${GMAGICK_INCLUDE_DIRS}
)
- LINK_DIRECTORIES(
+ link_directories(
${GMAGICK_LIBRARY}
)
-ENDIF()
-
-IF(HAVE_PODOFO)
- INCLUDE_DIRECTORIES(
+endif()
+
+if(HAVE_PODOFO)
+ include_directories(
${LIBPODOFO_INCLUDE_DIR}
)
-ENDIF()
-
-IF(HAVE_HYPHEN)
- TARGET_LINK_LIBRARIES(${EXE_NAME}
+endif()
+
+if(HAVE_HYPHEN)
+ target_link_libraries(${EXE_NAME}
${HYPHEN_LIBRARY}
)
-ENDIF()
-
-
-IF(GESTURE_FRAME_PREVIEW)
- MESSAGE(STATUS "Enable gesture frame preview [experimental]")
- SET(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp)
- ADD_DEFINITIONS(-DGESTURE_FRAME_PREVIEW)
-ENDIF()
-
-IF(APPLEBUNDLE)
- SET(EXE_NAME "Scribus${TAG_VERSION}" CACHE TYPE STRING)
-ELSE()
- SET(EXE_NAME "scribus${TAG_VERSION}" CACHE TYPE STRING)
-ENDIF()
-
-IF(COMMAND cmake_policy)
+endif()
+
+
+if(GESTURE_FRAME_PREVIEW)
+ message(STATUS "Enable gesture frame preview [experimental]")
+ set(GESTURE_FRAME_PREVIEW_SOURCES pageitempreview.cpp)
+ add_definitions(-DGESTURE_FRAME_PREVIEW)
+endif()
+
+if(APPLEBUNDLE)
+ set(EXE_NAME "Scribus${TAG_VERSION}" CACHE TYPE STRING)
+else()
+ set(EXE_NAME "scribus${TAG_VERSION}" CACHE TYPE STRING)
+endif()
+
+if(COMMAND cmake_policy)
cmake_policy(SET CMP0003 OLD)
-ENDIF()
-
-IF(HAVE_OSG)
- ADD_EXECUTABLE(${EXE_NAME}
+endif()
+
+if(HAVE_OSG)
+ add_executable(${EXE_NAME}
${SCRIBUS_MOC_SOURCES}
${SCRIBUS_SOURCES}
${SCRIBUS_MAIN_CPP}
@@ -1148,8 +1148,8 @@
${GESTURE_FRAME_PREVIEW_SOURCES}
${SCRIBUS_PRC_SOURCES}
)
-ELSE()
- ADD_EXECUTABLE(${EXE_NAME}
+else()
+ add_executable(${EXE_NAME}
${SCRIBUS_MOC_SOURCES}
${SCRIBUS_SOURCES}
${SCRIBUS_MAIN_CPP}
@@ -1162,46 +1162,46 @@
${SCRIBUS_WIN32_ONLY_SOURCES}
${GESTURE_FRAME_PREVIEW_SOURCES}
)
-ENDIF ()
-
-IF(WIN32)
- SET_TARGET_PROPERTIES(${EXE_NAME}
+endif ()
+
+if(WIN32)
+ set_target_properties(${EXE_NAME}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
ENABLE_EXPORTS TRUE
)
- SET(WIN32_ONLY_LIBS mscms.lib)
-ELSE()
- SET(WIN32_ONLY_LIBS)
-ENDIF()
+ set(WIN32_ONLY_LIBS mscms.lib)
+else()
+ set(WIN32_ONLY_LIBS)
+endif()
##TEST FIX FOR 6897
-IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+if (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
# Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
# binary are in the public symbol table for plugins. The symbols must also
# be set as SCRIBUS_API if we're building with -fvisibility=hidden .
# Should fix bug 6897 .
- SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
-ENDIF ()
-IF (GCC AND NOT WIN32)
+ set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
+endif ()
+if (GCC AND NOT WIN32)
# Use the -E / --export-dynamic flag to ensure that symbols in the Scribus
# binary are in the public symbol table for plugins. The symbols must also
# be set as SCRIBUS_API if we're building with -fvisibility=hidden .
# Should fix bug 6897 .
- SET_TARGET_PROPERTIES(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
-ENDIF ()
+ set_target_properties(${EXE_NAME} PROPERTIES LINK_FLAGS -Wl,-E)
+endif ()
##
#Set up libraries to link with all found packages
-INCLUDE_DIRECTORIES(${CAIRO_INCLUDE_DIR})
-TARGET_LINK_LIBRARIES(${EXE_NAME} ${CAIRO_LIBRARIES})
-LINK_DIRECTORIES(${PREFIX_CAIRO_LIB})
-SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${PREFIX_CAIRO_LIB}")
-
-MESSAGE("RPATH: ${CMAKE_INSTALL_RPATH}")
-
-TARGET_LINK_LIBRARIES(${EXE_NAME}
+include_directories(${CAIRO_INCLUDE_DIR})
+target_link_libraries(${EXE_NAME} ${CAIRO_LIBRARIES})
+link_directories(${PREFIX_CAIRO_LIB})
+set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_RPATH};${PREFIX_CAIRO_LIB}")
+
+message("RPATH: ${CMAKE_INSTALL_RPATH}")
+
+target_link_libraries(${EXE_NAME}
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
${Qt5Gui_LIBRARIES}
@@ -1226,38 +1226,38 @@
${ICU_LIBRARIES}
)
-IF (NOT WIN32 AND NOT HAIKU)
- TARGET_LINK_LIBRARIES(${EXE_NAME}
+if (NOT WIN32 AND NOT HAIKU)
+ target_link_libraries(${EXE_NAME}
${CUPS_LIBRARIES}
)
-ENDIF ()
+endif ()
# required to resolve symbols from libdl when ld is called with --no-add-needed
# #9310 for the OpenBSD addition
-IF(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
- TARGET_LINK_LIBRARIES(${EXE_NAME} dl)
-ENDIF()
+if(UNIX AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT HAIKU)
+ target_link_libraries(${EXE_NAME} dl)
+endif()
# #9311 for the OpenBSD addition
-IF(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
- TARGET_LINK_LIBRARIES(${EXE_NAME} util execinfo)
-ENDIF()
-
-IF(WIN32)
- TARGET_LINK_LIBRARIES(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
-ENDIF()
-
-IF(APPLE)
- TARGET_LINK_LIBRARIES(${EXE_NAME}
+if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+ target_link_libraries(${EXE_NAME} util execinfo)
+endif()
+
+if(WIN32)
+ target_link_libraries(${EXE_NAME} ${QT_QTMAIN_LIBRARY})
+endif()
+
+if(APPLE)
+ target_link_libraries(${EXE_NAME}
"-undefined dynamic_lookup"
"-framework CoreFoundation" )
-ENDIF()
-
-IF (WANT_SVNVERSION)
+endif()
+
+if (WANT_SVNVERSION)
add_dependencies(${EXE_NAME} svnheader)
-ENDIF ()
-
-TARGET_LINK_LIBRARIES(${EXE_NAME}
+endif ()
+
+target_link_libraries(${EXE_NAME}
${SCRIBUS_COLORMGMT_LIB}
${SCRIBUS_DESAXE_LIB}
${SCRIBUS_TEXT_LIB}
@@ -1270,21 +1270,21 @@
${LCMS2_LIBRARIES}
)
-IF(WITH_TESTS)
- TARGET_LINK_LIBRARIES(${EXE_NAME}
+if(WITH_TESTS)
+ target_link_libraries(${EXE_NAME}
${QT_QTTEST_LIBRARY}
${SCRIBUS_TESTS_LIB}
)
-ENDIF()
-
-IF(HAVE_PODOFO)
- TARGET_LINK_LIBRARIES(${EXE_NAME}
+endif()
+
+if(HAVE_PODOFO)
+ target_link_libraries(${EXE_NAME}
${LIBPODOFO_LIBRARY}
)
-ENDIF()
-
-IF(HAVE_OSG)
- TARGET_LINK_LIBRARIES(${EXE_NAME}
+endif()
+
+if(HAVE_OSG)
+ target_link_libraries(${EXE_NAME}
${OPENTHREADS_LIBRARY}
${OSG_LIBRARY}
${OSGGA_LIBRARY}
@@ -1294,17 +1294,17 @@
${OSGTEXT_LIBRARY}
${SCRIBUS_PRC_LIB}
)
-ENDIF()
-
-IF (HAVE_BOOST)
- TARGET_LINK_LIBRARIES(${EXE_NAME}
+endif()
+
+if (HAVE_BOOST)
+ target_link_libraries(${EXE_NAME}
${SCRIBUS_2GEOM_LIB}
)
-ENDIF()
+endif()
# Now build plugins
-SET(PLUGIN_LIBRARIES
+set(PLUGIN_LIBRARIES
${Qt5Core_LIBRARIES}
${Qt5Widgets_LIBRARIES}
${Qt5Gui_LIBRARIES}
@@ -1317,40 +1317,40 @@
${ZLIB_LIBRARIES}
)
-IF(WIN32)
+if(WIN32)
# IF your plugin needs more than this, please link them privately
# in the CMakeLists.txt for your plugin.
- SET(PLUGIN_LIBRARIES
+ set(PLUGIN_LIBRARIES
# ${QT_LIBRARIES} part of #7210
${PLUGIN_LIBRARIES}
${EXE_NAME}
)
-ENDIF()
-IF(APPLE)
- SET(PLUGIN_LIBRARIES
+endif()
+if(APPLE)
+ set(PLUGIN_LIBRARIES
${PLUGIN_LIBRARIES}
"-undefined dynamic_lookup"
)
-ENDIF()
-MESSAGE(STATUS ${PLUGIN_LIBRARIES})
-
-ADD_SUBDIRECTORY(plugins)
+endif()
+message(STATUS ${PLUGIN_LIBRARIES})
+
+add_subdirectory(plugins)
#do we want a lib suffix on osx? doubt it
-IF(APPLEBUNDLE)
- INSTALL(DIRECTORY DESTINATION MacOS)
- INSTALL(TARGETS ${EXE_NAME}
+if(APPLEBUNDLE)
+ install(DIRECTORY DESTINATION MacOS)
+ install(TARGETS ${EXE_NAME}
RUNTIME DESTINATION MacOS
LIBRARY DESTINATION lib
)
-# ADD_CUSTOM_COMMAND(TARGET ${EXE_NAME} POST_BUILD
+# add_custom_command(TARGET ${EXE_NAME} POST_BUILD
# COMMAND ${CMAKE_COMMAND} ARGS -Dinput_file=${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME}.app/Contents/MacOS/${EXE_NAME} -P ${CMAKE_MODULE_PATH}/ScribusIngestOSXBundleLibraries.cmake
# )
-#MESSAGE(STATUS "Installing apple bundle")
-
-# SET(APPS "${APPLE_APP_DIR}")
-# SET(DIRS ${QT_LIBRARY_DIRS})
-# INSTALL(CODE "
+#message(STATUS "Installing apple bundle")
+
+# set(APPS "${APPLE_APP_DIR}")
+# set(DIRS ${QT_LIBRARY_DIRS})
+# install(CODE "
# file(GLOB_RECURSE QTPLUGINS
# \"\${CMAKE_INSTALL_PREFIX}/${LIBDIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
# include(BundleUtilities)
@@ -1358,24 +1358,24 @@
# " COMPONENT Runtime)
-ELSE()
- IF(WIN32)
- INSTALL(TARGETS ${EXE_NAME}
+else()
+ if(WIN32)
+ install(TARGETS ${EXE_NAME}
RUNTIME DESTINATION .
LIBRARY DESTINATION ${LIB_DIR_NAME}
)
- ELSE()
- INSTALL(TARGETS ${EXE_NAME}
+ else()
+ install(TARGETS ${EXE_NAME}
RUNTIME DESTINATION bin
LIBRARY DESTINATION ${LIB_DIR_NAME}
)
- ENDIF()
-ENDIF()
+ endif()
+endif()
#Install our header files, selected from all existing dirs, excluding unwanted directories and svn files
-IF(WANT_HEADERINSTALL)
- MESSAGE(STATUS "Source header files will be installed")
- INSTALL(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${INCLUDEDIR}
+if(WANT_HEADERINSTALL)
+ message(STATUS "Source header files will be installed")
+ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/ DESTINATION ${INCLUDEDIR}
FILES_MATCHING
PATTERN "*.h"
PATTERN "dicts" EXCLUDE
@@ -1387,12 +1387,12 @@
PATTERN "old" EXCLUDE
PATTERN ".svn" EXCLUDE
)
-ELSE()
- MESSAGE(STATUS "No source header files will be installed")
-ENDIF()
+else()
+ message(STATUS "No source header files will be installed")
+endif()
#Install our stylesheet
-INSTALL(FILES
+install(FILES
scribus.css
DESTINATION ${LIBDIR}
)
Modified: trunk/Scribus/scribus/colormgmt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/colormgmt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/colormgmt/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/colormgmt/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,18 +1,18 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-INCLUDE_DIRECTORIES( ${LCMS2_INCLUDE_DIR} )
-SET(SCRIBUS_LCMS_IMPL_SOURCES
+include_directories( ${LCMS2_INCLUDE_DIR} )
+set(SCRIBUS_LCMS_IMPL_SOURCES
sclcms2colormgmtengineimpl.cpp
sclcms2colorprofileimpl.cpp
sclcms2colortransformimpl.cpp
)
-SET(SCRIBUS_COLORMGMT_LIB_SOURCES
+set(SCRIBUS_COLORMGMT_LIB_SOURCES
sccolormgmtengine.cpp
sccolormgmtenginedata.cpp
sccolormgmtenginefactory.cpp
@@ -28,11 +28,11 @@
${SCRIBUS_LCMS_IMPL_SOURCES}
)
-SET(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
-ADD_LIBRARY(${SCRIBUS_COLORMGMT_LIB} STATIC ${SCRIBUS_COLORMGMT_LIB_SOURCES})
+set(SCRIBUS_COLORMGMT_LIB "scribus_colormgmt_lib")
+add_library(${SCRIBUS_COLORMGMT_LIB} STATIC ${SCRIBUS_COLORMGMT_LIB_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_COLORMGMT_LIB}
+set_target_properties(${SCRIBUS_COLORMGMT_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/desaxe/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/desaxe/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/desaxe/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/desaxe/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,12 +1,12 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(SCRIBUS_DESAXE_LIB_SOURCES
+set(SCRIBUS_DESAXE_LIB_SOURCES
saxXML.cpp
saxiohelper.cpp
saxfilter.cpp
@@ -15,12 +15,12 @@
digester_parse.cpp
)
-SET(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
-ADD_LIBRARY(${SCRIBUS_DESAXE_LIB} STATIC ${SCRIBUS_DESAXE_LIB_SOURCES})
+set(SCRIBUS_DESAXE_LIB "scribus_desaxe_lib")
+add_library(${SCRIBUS_DESAXE_LIB} STATIC ${SCRIBUS_DESAXE_LIB_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_DESAXE_LIB}
+set_target_properties(${SCRIBUS_DESAXE_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/designer/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/designer/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/designer/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/designer/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,18 +1,18 @@
-# it's unfinished ADD_SUBDIRECTORY(smwidgets)
+# it's unfinished add_subdirectory(smwidgets)
-INCLUDE_DIRECTORIES(
+include_directories(
${FREETYPE_INCLUDE_DIRS}
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SCRIBUS_SCRSPINBOX_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SCRSPINBOX_PLUGIN_MOC_CLASSES
scrspinboxplugin.h
../commonstrings.h
../ui/scrspinbox.h
)
-SET(SCRIBUS_SCRSPINBOX_PLUGIN_SOURCES
+set(SCRIBUS_SCRSPINBOX_PLUGIN_SOURCES
scrspinboxplugin.cpp
../commonstrings.cpp
../fparser.cpp
@@ -20,62 +20,62 @@
../units.cpp
)
-SET(SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_CLASSES
sctablewidgetplugin.h
../ui/sctablewidget.h
)
-SET(SCRIBUS_SCTABLEWIDGET_PLUGIN_SOURCES
+set(SCRIBUS_SCTABLEWIDGET_PLUGIN_SOURCES
sctablewidgetplugin.cpp
../ui/sctablewidget.cpp
)
-SET(SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_CLASSES
sctextbrowserplugin.h
../ui/sctextbrowser.h
../urllauncher.h
)
-SET(SCRIBUS_SCTEXTBROWSER_PLUGIN_SOURCES
+set(SCRIBUS_SCTEXTBROWSER_PLUGIN_SOURCES
sctextbrowserplugin.cpp
../ui/sctextbrowser.cpp
../urllauncher.cpp
)
-SET(SCRIBUS_SCRSPINBOX_PLUGIN "scribus_scrspinbox")
-SET(SCRIBUS_SCTABLEWIDGET_PLUGIN "scribus_sctablewidget")
-SET(SCRIBUS_SCTEXTBROWSER_PLUGIN "scribus_sctextbrowser")
+set(SCRIBUS_SCRSPINBOX_PLUGIN "scribus_scrspinbox")
+set(SCRIBUS_SCTABLEWIDGET_PLUGIN "scribus_sctablewidget")
+set(SCRIBUS_SCTEXTBROWSER_PLUGIN "scribus_sctextbrowser")
QT5_WRAP_CPP(SCRIBUS_SCRSPINBOX_PLUGIN_MOC_SOURCES ${SCRIBUS_SCRSPINBOX_PLUGIN_MOC_CLASSES})
QT5_WRAP_CPP(SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_CLASSES})
QT5_WRAP_CPP(SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_SOURCES ${SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SCRSPINBOX_PLUGIN} SHARED ${SCRIBUS_SCRSPINBOX_PLUGIN_SOURCES} ${SCRIBUS_SCRSPINBOX_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCRSPINBOX_PLUGIN}
+add_library(${SCRIBUS_SCRSPINBOX_PLUGIN} SHARED ${SCRIBUS_SCRSPINBOX_PLUGIN_SOURCES} ${SCRIBUS_SCRSPINBOX_PLUGIN_MOC_SOURCES})
+target_link_libraries(${SCRIBUS_SCRSPINBOX_PLUGIN}
${QT_LIBRARIES}
)
-ADD_LIBRARY(${SCRIBUS_SCTABLEWIDGET_PLUGIN} SHARED ${SCRIBUS_SCTABLEWIDGET_PLUGIN_SOURCES} ${SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCTABLEWIDGET_PLUGIN}
+add_library(${SCRIBUS_SCTABLEWIDGET_PLUGIN} SHARED ${SCRIBUS_SCTABLEWIDGET_PLUGIN_SOURCES} ${SCRIBUS_SCTABLEWIDGET_PLUGIN_MOC_SOURCES})
+target_link_libraries(${SCRIBUS_SCTABLEWIDGET_PLUGIN}
${QT_LIBRARIES}
)
-ADD_LIBRARY(${SCRIBUS_SCTEXTBROWSER_PLUGIN} SHARED ${SCRIBUS_SCTEXTBROWSER_PLUGIN_SOURCES} ${SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCTEXTBROWSER_PLUGIN}
+add_library(${SCRIBUS_SCTEXTBROWSER_PLUGIN} SHARED ${SCRIBUS_SCTEXTBROWSER_PLUGIN_SOURCES} ${SCRIBUS_SCTEXTBROWSER_PLUGIN_MOC_SOURCES})
+target_link_libraries(${SCRIBUS_SCTEXTBROWSER_PLUGIN}
${QT_LIBRARIES}
)
-IF(APPLE)
- TARGET_LINK_LIBRARIES(${SCRIBUS_SCRSPINBOX_PLUGIN} "-undefined dynamic_lookup")
- TARGET_LINK_LIBRARIES(${SCRIBUS_SCTABLEWIDGET_PLUGIN} "-undefined dynamic_lookup")
- TARGET_LINK_LIBRARIES(${SCRIBUS_SCTEXTBROWSER_PLUGIN} "-undefined dynamic_lookup")
-ENDIF()
+if(APPLE)
+ target_link_libraries(${SCRIBUS_SCRSPINBOX_PLUGIN} "-undefined dynamic_lookup")
+ target_link_libraries(${SCRIBUS_SCTABLEWIDGET_PLUGIN} "-undefined dynamic_lookup")
+ target_link_libraries(${SCRIBUS_SCTEXTBROWSER_PLUGIN} "-undefined dynamic_lookup")
+endif()
# install it manually
-#INSTALL(TARGETS ${SCRIBUS_SCRSPINBOX_PLUGIN}
+#install(TARGETS ${SCRIBUS_SCRSPINBOX_PLUGIN}
# LIBRARY
# DESTINATION ${QT_INSTALL_PLUGINS}
# PERMISSIONS ${PLUGIN_PERMISSIONS}
#)
-# SET_TARGET_PROPERTIES(${SCRIBUS_DESIGNR_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_DESIGNR_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/designer/smwidgets/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_CLASSES
smalignselectplugin.h
../../smalignselect.h
../../alignselect.h
@@ -13,7 +13,7 @@
../../actionmanager.h
)
-SET(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_SOURCES
smalignselectplugin.cpp
../../smalignselect.cpp
../../alignselect.cpp
@@ -24,7 +24,7 @@
../../actionmanager.cpp
)
-SET(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_CLASSES
smcolorcomboplugin.h
../../smcolorcombo.h
../../colorcombo.h
@@ -32,7 +32,7 @@
../../commonstrings.h
)
-SET(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_SOURCES
smcolorcomboplugin.cpp
../../smcolorcombo.cpp
../../colorcombo.cpp
@@ -40,99 +40,99 @@
../../commonstrings.cpp
)
-SET(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_CLASSES
smfontcombohplugin.h
../../smfontcomboh.h
../../fontcombo.h
)
-SET(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_SOURCES
smfontcombohplugin.cpp
../../smfontcomboh.cpp
../../fontcombo.cpp
)
-SET(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_MOC_CLASSES
smsccomboboxplugin.h
../../smsccombobox.h
)
-SET(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_SOURCES
smsccomboboxplugin.cpp
../../smsccombobox.cpp
)
-SET(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_MOC_CLASSES
smscrspinboxplugin.h
../../ui/smscrspinbox.h
../../ui/scrspinbox.h
)
-SET(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_SOURCES
smscrspinboxplugin.cpp
../../ui/smscrspinbox.cpp
../../ui/scrspinbox.cpp
)
-SET(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_MOC_CLASSES
smshadebuttonplugin.h
../../smshadebutton.h
../../shadebutton.h
)
-SET(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_SOURCES
smshadebuttonplugin.cpp
../../smshadebutton.cpp
../../shadebutton.cpp
)
-SET(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_CLASSES
smspinboxplugin.h
../../smspinbox.h
)
-SET(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_SOURCES
smspinboxplugin.cpp
../../smspinbox.cpp
)
-SET(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_CLASSES
smstyleselectplugin.h
../../smstyleselect.h
../../styleselect.h
../../ui/scrspinbox.h
)
-SET(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_SOURCES
smstyleselectplugin.cpp
../../smstyleselect.cpp
../../styleselect.cpp
../../ui/scrspinbox.cpp
)
-SET(SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_CLASSES
+set(SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_CLASSES
smtabrulerplugin.h
../../smtabruler.h
../../tabruler.h
../../commonstrings.h
)
-SET(SCRIBUS_SMTABRULERPLUGIN_PLUGIN_SOURCES
+set(SCRIBUS_SMTABRULERPLUGIN_PLUGIN_SOURCES
smtabrulerplugin.cpp
../../smtabruler.cpp
../../tabruler.cpp
../../commonstrings.cpp
)
-SET(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN "scribus_smalignselectplugin")
-SET(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN "scribus_smcolorcomboplugin")
-SET(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN "scribus_smfontcombohplugin")
-SET(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN "scribus_smsccomboboxplugin")
-SET(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN "scribus_smscrspinboxplugin")
-SET(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN "scribus_smshadebuttonplugin")
-SET(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN "scribus_smspinboxplugin")
-SET(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN "scribus_smstyleselectplugin")
-SET(SCRIBUS_SMTABRULERPLUGIN_PLUGIN "scribus_smtabrulerplugin")
+set(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN "scribus_smalignselectplugin")
+set(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN "scribus_smcolorcomboplugin")
+set(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN "scribus_smfontcombohplugin")
+set(SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN "scribus_smsccomboboxplugin")
+set(SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN "scribus_smscrspinboxplugin")
+set(SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN "scribus_smshadebuttonplugin")
+set(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN "scribus_smspinboxplugin")
+set(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN "scribus_smstyleselectplugin")
+set(SCRIBUS_SMTABRULERPLUGIN_PLUGIN "scribus_smtabrulerplugin")
QT5_WRAP_CPP(SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_CLASSES})
QT5_WRAP_CPP(SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_CLASSES})
QT5_WRAP_CPP(SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_CLASSES})
@@ -142,67 +142,67 @@
QT5_WRAP_CPP(SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_CLASSES})
QT5_WRAP_CPP(SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_CLASSES})
QT5_WRAP_CPP(SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_SOURCES ${SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN}
+add_library(${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-ADD_LIBRARY(${SCRIBUS_SMTABRULERPLUGIN_PLUGIN}
+target_link_libraries(${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+add_library(${SCRIBUS_SMTABRULERPLUGIN_PLUGIN}
SHARED ${SCRIBUS_SMTABRULERPLUGIN_PLUGIN_SOURCES}
${SCRIBUS_SMTABRULERPLUGIN_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMTABRULERPLUGIN_PLUGIN} ${QT_LIBRARIES} )
-
-IF(APPLE)
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-
- TARGET_LINK_LIBRARIES(${SCRIBUS_SMTABRULERPLUGIN_PLUGIN} "-undefined dynamic_lookup")
-ENDIF()
+target_link_libraries(${SCRIBUS_SMTABRULERPLUGIN_PLUGIN} ${QT_LIBRARIES} )
+
+if(APPLE)
+ target_link_libraries(${SCRIBUS_SMALIGNSELECTPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMCOLORCOMBOPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMFONTCOMBOHPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMSCCOMBOBOXPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMSCRSPINBOXPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMSHADEBUTTONPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMSPINBOXPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMSTYLESELECTPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+
+ target_link_libraries(${SCRIBUS_SMTABRULERPLUGIN_PLUGIN} "-undefined dynamic_lookup")
+endif()
Modified: trunk/Scribus/scribus/dtd/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/dtd/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/dtd/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/dtd/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
scribuspdfoptions.dtd
DESTINATION ${SHAREDIR}dtd
)
Modified: trunk/Scribus/scribus/fonts/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/fonts/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/fonts/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/fonts/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,12 +1,12 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(SCRIBUS_FONTS_LIB_SOURCES
+set(SCRIBUS_FONTS_LIB_SOURCES
scface.cpp
ftface.cpp
scface_ps.cpp
@@ -15,11 +15,11 @@
scface_ttf.cpp
scfontmetrics.cpp
)
-SET(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
-ADD_LIBRARY(${SCRIBUS_FONTS_LIB} STATIC ${SCRIBUS_FONTS_LIB_SOURCES})
+set(SCRIBUS_FONTS_LIB "scribus_fonts_lib")
+add_library(${SCRIBUS_FONTS_LIB} STATIC ${SCRIBUS_FONTS_LIB_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_FONTS_LIB}
+set_target_properties(${SCRIBUS_FONTS_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/plugins/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,26 +1,26 @@
-ADD_SUBDIRECTORY(export)
-ADD_SUBDIRECTORY(import)
-ADD_SUBDIRECTORY(barcodegenerator)
-ADD_SUBDIRECTORY(colorwheel)
-ADD_SUBDIRECTORY(fileloader)
-ADD_SUBDIRECTORY(fontpreview)
-ADD_SUBDIRECTORY(gettext)
-# ADD_SUBDIRECTORY(newfromtemplateplugin)
-ADD_SUBDIRECTORY(saveastemplateplugin)
-IF(NOT WANT_SCRIPTER2)
+add_subdirectory(export)
+add_subdirectory(import)
+add_subdirectory(barcodegenerator)
+add_subdirectory(colorwheel)
+add_subdirectory(fileloader)
+add_subdirectory(fontpreview)
+add_subdirectory(gettext)
+# add_subdirectory(newfromtemplateplugin)
+add_subdirectory(saveastemplateplugin)
+if(NOT WANT_SCRIPTER2)
#scripter1
- IF(NOT WIN32)
- MESSAGE(STATUS "Building with Scripter 1")
- ADD_SUBDIRECTORY(scriptplugin)
- ENDIF()
-ELSE()
+ if(NOT WIN32)
+ message(STATUS "Building with Scripter 1")
+ add_subdirectory(scriptplugin)
+ endif()
+else()
#scripter2
- MESSAGE(STATUS "Building with Scripter 2")
- ADD_SUBDIRECTORY(scripter)
-ENDIF()
-ADD_SUBDIRECTORY(short-words)
-ADD_SUBDIRECTORY(tools)
-ADD_SUBDIRECTORY(picbrowser)
-ADD_SUBDIRECTORY(shapes)
+ message(STATUS "Building with Scripter 2")
+ add_subdirectory(scripter)
+endif()
+add_subdirectory(short-words)
+add_subdirectory(tools)
+add_subdirectory(picbrowser)
+add_subdirectory(shapes)
-# ADD_SUBDIRECTORY(myplugin)
+# add_subdirectory(myplugin)
Modified: trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/barcodegenerator/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,43 +1,43 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(BARCODEGENERATOR_PLUGIN_UI_SRC
+set(BARCODEGENERATOR_PLUGIN_UI_SRC
barcodegenerator.ui
)
-SET(BARCODEGENERATOR_PLUGIN_MOC_CLASSES
+set(BARCODEGENERATOR_PLUGIN_MOC_CLASSES
barcode.h
barcodegenerator.h
barcodegeneratorrenderthread.h
)
-SET(BARCODEGENERATOR_PLUGIN_SOURCES
+set(BARCODEGENERATOR_PLUGIN_SOURCES
barcode.cpp
barcodegenerator.cpp
barcodegeneratorrenderthread.cpp
)
-SET(SCRIBUS_BARCODEGENERATOR_PLUGIN "barcodegenerator")
+set(SCRIBUS_BARCODEGENERATOR_PLUGIN "barcodegenerator")
QT5_WRAP_UI(BARCODEGENERATOR_PLUGIN_UI_SOURCES ${BARCODEGENERATOR_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(BARCODEGENERATOR_PLUGIN_MOC_SOURCES ${BARCODEGENERATOR_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_BARCODEGENERATOR_PLUGIN} MODULE ${BARCODEGENERATOR_PLUGIN_SOURCES} ${BARCODEGENERATOR_PLUGIN_MOC_SOURCES} ${BARCODEGENERATOR_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_BARCODEGENERATOR_PLUGIN} MODULE ${BARCODEGENERATOR_PLUGIN_SOURCES} ${BARCODEGENERATOR_PLUGIN_MOC_SOURCES} ${BARCODEGENERATOR_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_BARCODEGENERATOR_PLUGIN}
+install(TARGETS ${SCRIBUS_BARCODEGENERATOR_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-INSTALL(FILES barcode.ps
+install(FILES barcode.ps
DESTINATION ${SHAREDIR}/plugins
)
-ADD_DEPENDENCIES(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_BARCODEGENERATOR_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_BARCODEGENERATOR_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_BARCODEGENERATOR_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/colorwheel/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,39 +1,39 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(COLORWHEEL_PLUGIN_UI_SRC
+set(COLORWHEEL_PLUGIN_UI_SRC
cwdialog.ui
)
-SET(COLORWHEEL_PLUGIN_MOC_CLASSES
+set(COLORWHEEL_PLUGIN_MOC_CLASSES
colorwheel.h
colorwheelwidget.h
cwdialog.h
)
-SET(COLORWHEEL_PLUGIN_SOURCES
+set(COLORWHEEL_PLUGIN_SOURCES
colorwheel.cpp
colorwheelwidget.cpp
cwdialog.cpp
)
-SET(SCRIBUS_COLORWHEEL_PLUGIN "colorwheel")
+set(SCRIBUS_COLORWHEEL_PLUGIN "colorwheel")
QT5_WRAP_UI(COLORWHEEL_PLUGIN_UI_SOURCES ${COLORWHEEL_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(COLORWHEEL_PLUGIN_MOC_SOURCES ${COLORWHEEL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_COLORWHEEL_PLUGIN} MODULE ${COLORWHEEL_PLUGIN_SOURCES} ${COLORWHEEL_PLUGIN_MOC_SOURCES} ${COLORWHEEL_PLUGIN_UI_CPP} ${COLORWHEEL_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_COLORWHEEL_PLUGIN} MODULE ${COLORWHEEL_PLUGIN_SOURCES} ${COLORWHEEL_PLUGIN_MOC_SOURCES} ${COLORWHEEL_PLUGIN_UI_CPP} ${COLORWHEEL_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_COLORWHEEL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_COLORWHEEL_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_COLORWHEEL_PLUGIN}
+install(TARGETS ${SCRIBUS_COLORWHEEL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_COLORWHEEL_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_COLORWHEEL_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/export/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/export/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/export/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,3 +1,3 @@
-ADD_SUBDIRECTORY(pixmapexport)
-ADD_SUBDIRECTORY(svgexplugin)
-ADD_SUBDIRECTORY(xpsexport)
+add_subdirectory(pixmapexport)
+add_subdirectory(svgexplugin)
+add_subdirectory(xpsexport)
Modified: trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/export/pixmapexport/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,37 +1,37 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC
+set(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC
exportform.ui
)
-SET(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES
+set(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES
dialog.h
export.h
)
-SET(SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES
+set(SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES
dialog.cpp
export.cpp
)
-SET(SCRIBUS_PIXMAPEXPORT_PLUGIN "scribusexportpixmap")
+set(SCRIBUS_PIXMAPEXPORT_PLUGIN "scribusexportpixmap")
QT5_WRAP_UI(SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_PIXMAPEXPORT_PLUGIN} MODULE ${SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PIXMAPEXPORT_PLUGIN} MODULE ${SCRIBUS_PIXMAPEXPORT_PLUGIN_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_MOC_SOURCES} ${SCRIBUS_PIXMAPEXPORT_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_PIXMAPEXPORT_PLUGIN}
+install(TARGETS ${SCRIBUS_PIXMAPEXPORT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_PIXMAPEXPORT_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/export/svgexplugin/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(EXPORTSVG_PLUGIN_MOC_CLASSES
+set(EXPORTSVG_PLUGIN_MOC_CLASSES
svgexplugin.h
)
-SET(EXPORTSVG_PLUGIN_SOURCES
+set(EXPORTSVG_PLUGIN_SOURCES
svgexplugin.cpp
)
-SET(SCRIBUS_EXPORTSVG_PLUGIN "svgexplugin")
+set(SCRIBUS_EXPORTSVG_PLUGIN "svgexplugin")
QT5_WRAP_CPP(EXPORTSVG_PLUGIN_MOC_SOURCES ${EXPORTSVG_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_EXPORTSVG_PLUGIN} MODULE ${EXPORTSVG_PLUGIN_SOURCES} ${EXPORTSVG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_EXPORTSVG_PLUGIN} MODULE ${EXPORTSVG_PLUGIN_SOURCES} ${EXPORTSVG_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_EXPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_EXPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_EXPORTSVG_PLUGIN}
+install(TARGETS ${SCRIBUS_EXPORTSVG_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_EXPORTSVG_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_EXPORTSVG_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/export/xpsexport/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(EXPORTXPS_PLUGIN_MOC_CLASSES
+set(EXPORTXPS_PLUGIN_MOC_CLASSES
xpsexplugin.h
)
-SET(EXPORTXPS_PLUGIN_SOURCES
+set(EXPORTXPS_PLUGIN_SOURCES
xpsexplugin.cpp
)
-SET(SCRIBUS_EXPORTXPS_PLUGIN "xpsexplugin")
+set(SCRIBUS_EXPORTXPS_PLUGIN "xpsexplugin")
QT5_WRAP_CPP(EXPORTXPS_PLUGIN_MOC_SOURCES ${EXPORTXPS_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_EXPORTXPS_PLUGIN} MODULE ${EXPORTXPS_PLUGIN_SOURCES} ${EXPORTXPS_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_EXPORTXPS_PLUGIN} MODULE ${EXPORTXPS_PLUGIN_SOURCES} ${EXPORTXPS_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_EXPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+target_link_libraries(${SCRIBUS_EXPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
-INSTALL(TARGETS ${SCRIBUS_EXPORTXPS_PLUGIN}
+install(TARGETS ${SCRIBUS_EXPORTXPS_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_EXPORTXPS_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_EXPORTXPS_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/fileloader/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/fileloader/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,5 +1,5 @@
#Subdirectories
-ADD_SUBDIRECTORY(scribus150format)
-ADD_SUBDIRECTORY(scribus134format)
-ADD_SUBDIRECTORY(scribus13format)
-ADD_SUBDIRECTORY(scribus12format)
+add_subdirectory(scribus150format)
+add_subdirectory(scribus134format)
+add_subdirectory(scribus13format)
+add_subdirectory(scribus12format)
Modified: trunk/Scribus/scribus/plugins/fileloader/oldscribusformat/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/fileloader/oldscribusformat/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/oldscribusformat/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/oldscribusformat/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,29 +1,29 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(OLDSCRFORMAT_FL_PLUGIN_MOC_CLASSES
+set(OLDSCRFORMAT_FL_PLUGIN_MOC_CLASSES
oldscribusformat.h
oldscribusformatimpl.h
)
-SET(OLDSCRFORMAT_FL_PLUGIN_SOURCES
+set(OLDSCRFORMAT_FL_PLUGIN_SOURCES
oldscribusformat.cpp
oldscribusformatimpl.cpp
)
-SET(SCRIBUS_OLDSCRFORMAT_FL_PLUGIN "oldscribusformat")
+set(SCRIBUS_OLDSCRFORMAT_FL_PLUGIN "oldscribusformat")
SCRIBUS_QT_WRAP_CPP(OLDSCRFORMAT_FL_PLUGIN_MOC_SOURCES ${OLDSCRFORMAT_FL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_OLDSCRFORMAT_FL_PLUGIN} MODULE ${OLDSCRFORMAT_FL_PLUGIN_SOURCES} ${OLDSCRFORMAT_FL_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_OLDSCRFORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+add_library(${SCRIBUS_OLDSCRFORMAT_FL_PLUGIN} MODULE ${OLDSCRFORMAT_FL_PLUGIN_SOURCES} ${OLDSCRFORMAT_FL_PLUGIN_MOC_SOURCES})
+target_link_libraries(${SCRIBUS_OLDSCRFORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_OLDSCRFORMAT_FL_PLUGIN}
+install(TARGETS ${SCRIBUS_OLDSCRFORMAT_FL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus12format/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SCR12FORMAT_FL_PLUGIN_MOC_CLASSES
+set(SCR12FORMAT_FL_PLUGIN_MOC_CLASSES
scribus12format.h
scribus12formatimpl.h
)
-SET(SCR12FORMAT_FL_PLUGIN_SOURCES
+set(SCR12FORMAT_FL_PLUGIN_SOURCES
scribus12format.cpp
scribus12formatimpl.cpp
)
-SET(SCRIBUS_SCR12FORMAT_FL_PLUGIN "scribus12format")
+set(SCRIBUS_SCR12FORMAT_FL_PLUGIN "scribus12format")
QT5_WRAP_CPP(SCR12FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR12FORMAT_FL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} MODULE ${SCR12FORMAT_FL_PLUGIN_SOURCES} ${SCR12FORMAT_FL_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} MODULE ${SCR12FORMAT_FL_PLUGIN_SOURCES} ${SCR12FORMAT_FL_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR12FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SCR12FORMAT_FL_PLUGIN}
+install(TARGETS ${SCRIBUS_SCR12FORMAT_FL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus134format/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SCR134FORMAT_FL_PLUGIN_MOC_CLASSES
+set(SCR134FORMAT_FL_PLUGIN_MOC_CLASSES
scribus134format.h
scribus134formatimpl.h
)
-SET(SCR134FORMAT_FL_PLUGIN_SOURCES
+set(SCR134FORMAT_FL_PLUGIN_SOURCES
scribus134format.cpp
scribus134formatimpl.cpp
)
-SET(SCRIBUS_SCR134FORMAT_FL_PLUGIN "scribus134format")
+set(SCRIBUS_SCR134FORMAT_FL_PLUGIN "scribus134format")
QT5_WRAP_CPP(SCR134FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR134FORMAT_FL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} MODULE ${SCR134FORMAT_FL_PLUGIN_SOURCES} ${SCR134FORMAT_FL_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} MODULE ${SCR134FORMAT_FL_PLUGIN_SOURCES} ${SCR134FORMAT_FL_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR134FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SCR134FORMAT_FL_PLUGIN}
+install(TARGETS ${SCRIBUS_SCR134FORMAT_FL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus13format/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SCR13FORMAT_FL_PLUGIN_MOC_CLASSES
+set(SCR13FORMAT_FL_PLUGIN_MOC_CLASSES
scribus13format.h
scribus13formatimpl.h
)
-SET(SCR13FORMAT_FL_PLUGIN_SOURCES
+set(SCR13FORMAT_FL_PLUGIN_SOURCES
scribus13format.cpp
scribus13formatimpl.cpp
)
-SET(SCRIBUS_SCR13FORMAT_FL_PLUGIN "scribus13format")
+set(SCRIBUS_SCR13FORMAT_FL_PLUGIN "scribus13format")
QT5_WRAP_CPP(SCR13FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR13FORMAT_FL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} MODULE ${SCR13FORMAT_FL_PLUGIN_SOURCES} ${SCR13FORMAT_FL_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} MODULE ${SCR13FORMAT_FL_PLUGIN_SOURCES} ${SCR13FORMAT_FL_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR13FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SCR13FORMAT_FL_PLUGIN}
+install(TARGETS ${SCRIBUS_SCR13FORMAT_FL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fileloader/scribus150format/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,31 +1,31 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SCR150FORMAT_FL_PLUGIN_MOC_CLASSES
+set(SCR150FORMAT_FL_PLUGIN_MOC_CLASSES
scribus150format.h
scribus150formatimpl.h
)
-SET(SCR150FORMAT_FL_PLUGIN_SOURCES
+set(SCR150FORMAT_FL_PLUGIN_SOURCES
scribus150format.cpp
scribus150format_save.cpp
scribus150formatimpl.cpp
)
-SET(SCRIBUS_SCR150FORMAT_FL_PLUGIN "scribus150format")
+set(SCRIBUS_SCR150FORMAT_FL_PLUGIN "scribus150format")
QT5_WRAP_CPP(SCR150FORMAT_FL_PLUGIN_MOC_SOURCES ${SCR150FORMAT_FL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} MODULE ${SCR150FORMAT_FL_PLUGIN_SOURCES} ${SCR150FORMAT_FL_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} MODULE ${SCR150FORMAT_FL_PLUGIN_SOURCES} ${SCR150FORMAT_FL_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCR150FORMAT_FL_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SCR150FORMAT_FL_PLUGIN}
+install(TARGETS ${SCRIBUS_SCR150FORMAT_FL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/fontpreview/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,35 +1,35 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(FONTPREVIEW_PLUGIN_UI_SRC
+set(FONTPREVIEW_PLUGIN_UI_SRC
fontpreview.ui
)
-SET(FONTPREVIEW_PLUGIN_MOC_CLASSES
+set(FONTPREVIEW_PLUGIN_MOC_CLASSES
fontpreview.h
fontpreviewplugin.h
)
-SET(FONTPREVIEW_PLUGIN_SOURCES
+set(FONTPREVIEW_PLUGIN_SOURCES
fontpreview.cpp
fontpreviewplugin.cpp
)
-SET(SCRIBUS_FONTPREVIEW_PLUGIN "fontpreview")
+set(SCRIBUS_FONTPREVIEW_PLUGIN "fontpreview")
QT5_WRAP_UI(FONTPREVIEW_PLUGIN_UI_SOURCES ${FONTPREVIEW_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(FONTPREVIEW_PLUGIN_MOC_SOURCES ${FONTPREVIEW_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_FONTPREVIEW_PLUGIN} MODULE ${FONTPREVIEW_PLUGIN_SOURCES} ${FONTPREVIEW_PLUGIN_MOC_SOURCES} ${FONTPREVIEW_PLUGIN_UI_CPP} ${FONTPREVIEW_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_FONTPREVIEW_PLUGIN} MODULE ${FONTPREVIEW_PLUGIN_SOURCES} ${FONTPREVIEW_PLUGIN_MOC_SOURCES} ${FONTPREVIEW_PLUGIN_UI_CPP} ${FONTPREVIEW_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_FONTPREVIEW_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_FONTPREVIEW_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_FONTPREVIEW_PLUGIN}
+install(TARGETS ${SCRIBUS_FONTPREVIEW_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,17 +1,17 @@
#Subdirectories
-ADD_SUBDIRECTORY(csvim)
-ADD_SUBDIRECTORY(docim)
-IF(HAVE_XML)
- ADD_SUBDIRECTORY(docxim)
- ADD_SUBDIRECTORY(htmlim)
-# ADD_SUBDIRECTORY(odtim)
- ADD_SUBDIRECTORY(odt2im)
-ENDIF()
-ADD_SUBDIRECTORY(pdbim)
-ADD_SUBDIRECTORY(rtfim)
-IF(HAVE_XML)
- ADD_SUBDIRECTORY(sxwim)
-ENDIF()
-ADD_SUBDIRECTORY(textfilter)
-ADD_SUBDIRECTORY(txtim)
-ADD_SUBDIRECTORY(xtgim)
+add_subdirectory(csvim)
+add_subdirectory(docim)
+if(HAVE_XML)
+ add_subdirectory(docxim)
+ add_subdirectory(htmlim)
+# add_subdirectory(odtim)
+ add_subdirectory(odt2im)
+endif()
+add_subdirectory(pdbim)
+add_subdirectory(rtfim)
+if(HAVE_XML)
+ add_subdirectory(sxwim)
+endif()
+add_subdirectory(textfilter)
+add_subdirectory(txtim)
+add_subdirectory(xtgim)
Modified: trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/csvim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(CSV_GT_PLUGIN_MOC_CLASSES
+set(CSV_GT_PLUGIN_MOC_CLASSES
csvdia.h
)
-SET(CSV_GT_PLUGIN_SOURCES
+set(CSV_GT_PLUGIN_SOURCES
csvim.cpp
csvdia.cpp
)
-SET(SCRIBUS_CSV_GT_PLUGIN "csvim")
+set(SCRIBUS_CSV_GT_PLUGIN "csvim")
QT5_WRAP_CPP(CSV_GT_PLUGIN_MOC_SOURCES ${CSV_GT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_CSV_GT_PLUGIN} MODULE ${CSV_GT_PLUGIN_SOURCES} ${CSV_GT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_CSV_GT_PLUGIN} MODULE ${CSV_GT_PLUGIN_SOURCES} ${CSV_GT_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_CSV_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_CSV_GT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_CSV_GT_PLUGIN}
+install(TARGETS ${SCRIBUS_CSV_GT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/docim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,28 +1,28 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(DOC_GT_PLUGIN_MOC_CLASSES
+set(DOC_GT_PLUGIN_MOC_CLASSES
docim.h
)
-SET(DOC_GT_PLUGIN_SOURCES
+set(DOC_GT_PLUGIN_SOURCES
docim.cpp
)
-SET(SCRIBUS_DOC_GT_PLUGIN "docim")
+set(SCRIBUS_DOC_GT_PLUGIN "docim")
QT5_WRAP_CPP(DOC_GT_PLUGIN_MOC_SOURCES ${DOC_GT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_DOC_GT_PLUGIN} MODULE ${DOC_GT_PLUGIN_SOURCES} ${DOC_GT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_DOC_GT_PLUGIN} MODULE ${DOC_GT_PLUGIN_SOURCES} ${DOC_GT_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_DOC_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_DOC_GT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_DOC_GT_PLUGIN}
+install(TARGETS ${SCRIBUS_DOC_GT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/docxim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,22 +1,22 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(DOCX_IM_PLUGIN_SOURCES
+set(DOCX_IM_PLUGIN_SOURCES
docxim.cpp
)
-SET(SCRIBUS_DOCX_IM_PLUGIN "docximplugin")
+set(SCRIBUS_DOCX_IM_PLUGIN "docximplugin")
-ADD_LIBRARY(${SCRIBUS_DOCX_IM_PLUGIN} MODULE ${DOCX_IM_PLUGIN_SOURCES})
+add_library(${SCRIBUS_DOCX_IM_PLUGIN} MODULE ${DOCX_IM_PLUGIN_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_DOCX_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_DOCX_LIB})
+target_link_libraries(${SCRIBUS_DOCX_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_DOCX_LIB})
-INSTALL(TARGETS ${SCRIBUS_DOCX_IM_PLUGIN}
+install(TARGETS ${SCRIBUS_DOCX_IM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/htmlim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,29 +1,29 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(HTML_GT_PLUGIN_MOC_CLASSES
+set(HTML_GT_PLUGIN_MOC_CLASSES
# htmlim.h
)
-SET(HTML_GT_PLUGIN_SOURCES
+set(HTML_GT_PLUGIN_SOURCES
htmlim.cpp
htmlreader.cpp
)
-SET(SCRIBUS_HTML_GT_PLUGIN "htmlim")
+set(SCRIBUS_HTML_GT_PLUGIN "htmlim")
QT5_WRAP_CPP(HTML_GT_PLUGIN_MOC_SOURCES ${HTML_GT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_HTML_GT_PLUGIN} MODULE ${HTML_GT_PLUGIN_SOURCES} ${HTML_GT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_HTML_GT_PLUGIN} MODULE ${HTML_GT_PLUGIN_SOURCES} ${HTML_GT_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_HTML_GT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_HTML_GT_PLUGIN}
+install(TARGETS ${SCRIBUS_HTML_GT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/odt2im/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,22 +1,22 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(ODT_IM_PLUGIN_SOURCES
+set(ODT_IM_PLUGIN_SOURCES
importodt.cpp
)
-SET(SCRIBUS_ODT_IM_PLUGIN "odtimplugin")
+set(SCRIBUS_ODT_IM_PLUGIN "odtimplugin")
-ADD_LIBRARY(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES})
+add_library(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_ODT_IM_PLUGIN}
+install(TARGETS ${SCRIBUS_ODT_IM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/odtim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,31 +1,31 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(ODT_IM_PLUGIN_MOC_CLASSES
+set(ODT_IM_PLUGIN_MOC_CLASSES
odtdia.h
)
-SET(ODT_IM_PLUGIN_SOURCES
+set(ODT_IM_PLUGIN_SOURCES
contentreader.cpp
odtdia.cpp
odtim.cpp
stylereader.cpp
)
-SET(SCRIBUS_ODT_IM_PLUGIN "odtimplugin")
+set(SCRIBUS_ODT_IM_PLUGIN "odtimplugin")
QT5_WRAP_CPP(ODT_IM_PLUGIN_MOC_SOURCES ${ODT_IM_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES} ${ODT_IM_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_ODT_IM_PLUGIN} MODULE ${ODT_IM_PLUGIN_SOURCES} ${ODT_IM_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_ODT_IM_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_ODT_IM_PLUGIN}
+install(TARGETS ${SCRIBUS_ODT_IM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/pdbim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,22 +1,22 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(PDB_GT_PLUGIN_SOURCES
+set(PDB_GT_PLUGIN_SOURCES
pdbim.cpp
)
-SET(SCRIBUS_PDB_GT_PLUGIN "pdbim")
+set(SCRIBUS_PDB_GT_PLUGIN "pdbim")
-ADD_LIBRARY(${SCRIBUS_PDB_GT_PLUGIN} MODULE ${PDB_GT_PLUGIN_SOURCES})
+add_library(${SCRIBUS_PDB_GT_PLUGIN} MODULE ${PDB_GT_PLUGIN_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PDB_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PDB_GT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_PDB_GT_PLUGIN}
+install(TARGETS ${SCRIBUS_PDB_GT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/rtfim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,22 +1,22 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(RTF_IM_PLUGIN_SOURCES
+set(RTF_IM_PLUGIN_SOURCES
rtfim.cpp
)
-SET(SCRIBUS_RTF_IM_PLUGIN "rtfimplugin")
+set(SCRIBUS_RTF_IM_PLUGIN "rtfimplugin")
-ADD_LIBRARY(${SCRIBUS_RTF_IM_PLUGIN} MODULE ${RTF_IM_PLUGIN_SOURCES})
+add_library(${SCRIBUS_RTF_IM_PLUGIN} MODULE ${RTF_IM_PLUGIN_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_RTF_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_RTF_LIB})
+target_link_libraries(${SCRIBUS_RTF_IM_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_RTF_LIB})
-INSTALL(TARGETS ${SCRIBUS_RTF_IM_PLUGIN}
+install(TARGETS ${SCRIBUS_RTF_IM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/sxwim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,31 +1,31 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SXW_IM_PLUGIN_MOC_CLASSES
+set(SXW_IM_PLUGIN_MOC_CLASSES
sxwdia.h
)
-SET(SXW_IM_PLUGIN_SOURCES
+set(SXW_IM_PLUGIN_SOURCES
contentreader.cpp
sxwdia.cpp
sxwim.cpp
stylereader.cpp
)
-SET(SCRIBUS_SXW_IM_PLUGIN "sxwimplugin")
+set(SCRIBUS_SXW_IM_PLUGIN "sxwimplugin")
QT5_WRAP_CPP(SXW_IM_PLUGIN_MOC_SOURCES ${SXW_IM_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SXW_IM_PLUGIN} MODULE ${SXW_IM_PLUGIN_SOURCES} ${SXW_IM_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SXW_IM_PLUGIN} MODULE ${SXW_IM_PLUGIN_SOURCES} ${SXW_IM_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SXW_IM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SXW_IM_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SXW_IM_PLUGIN}
+install(TARGETS ${SCRIBUS_SXW_IM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/textfilter/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,31 +1,31 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(TEXTFILTER_GT_PLUGIN_MOC_CLASSES
+set(TEXTFILTER_GT_PLUGIN_MOC_CLASSES
tffilter.h
tfdia.h
)
-SET(TEXTFILTER_GT_PLUGIN_SOURCES
+set(TEXTFILTER_GT_PLUGIN_SOURCES
textfilter.cpp
tffilter.cpp
tfdia.cpp
)
-SET(SCRIBUS_TEXTFILTER_GT_PLUGIN "textfilterplugin")
+set(SCRIBUS_TEXTFILTER_GT_PLUGIN "textfilterplugin")
QT5_WRAP_CPP(TEXTFILTER_GT_PLUGIN_MOC_SOURCES ${TEXTFILTER_GT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_TEXTFILTER_GT_PLUGIN} MODULE ${TEXTFILTER_GT_PLUGIN_SOURCES} ${TEXTFILTER_GT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_TEXTFILTER_GT_PLUGIN} MODULE ${TEXTFILTER_GT_PLUGIN_SOURCES} ${TEXTFILTER_GT_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_TEXTFILTER_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_TEXTFILTER_GT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_TEXTFILTER_GT_PLUGIN}
+install(TARGETS ${SCRIBUS_TEXTFILTER_GT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/txtim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,24 +1,24 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(TXT_GT_PLUGIN_SOURCES
+set(TXT_GT_PLUGIN_SOURCES
txtim.cpp
)
-SET(SCRIBUS_TXT_GT_PLUGIN "txtim")
+set(SCRIBUS_TXT_GT_PLUGIN "txtim")
-ADD_LIBRARY(${SCRIBUS_TXT_GT_PLUGIN} MODULE ${TXT_GT_PLUGIN_SOURCES})
+add_library(${SCRIBUS_TXT_GT_PLUGIN} MODULE ${TXT_GT_PLUGIN_SOURCES})
-LINK_LIBRARIES (${LIBXML2_LIBRARIES})
+link_libraries (${LIBXML2_LIBRARIES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_TXT_GT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_TXT_GT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_TXT_GT_PLUGIN}
+install(TARGETS ${SCRIBUS_TXT_GT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/gettext/xtgim/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,23 +1,23 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(XTG_IM_PLUGIN_SOURCES
+set(XTG_IM_PLUGIN_SOURCES
xtgim.cpp
xtgscanner.cpp
)
-SET(SCRIBUS_XTG_IM_PLUGIN "xtgimplugin")
+set(SCRIBUS_XTG_IM_PLUGIN "xtgimplugin")
-ADD_LIBRARY(${SCRIBUS_XTG_IM_PLUGIN} MODULE ${XTG_IM_PLUGIN_SOURCES})
+add_library(${SCRIBUS_XTG_IM_PLUGIN} MODULE ${XTG_IM_PLUGIN_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_XTG_IM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_XTG_IM_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_XTG_IM_PLUGIN}
+install(TARGETS ${SCRIBUS_XTG_IM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}gettext
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,33 +1,33 @@
-ADD_SUBDIRECTORY(ai)
-ADD_SUBDIRECTORY(cdr)
-ADD_SUBDIRECTORY(cgm)
-ADD_SUBDIRECTORY(cvg)
-ADD_SUBDIRECTORY(drw)
-ADD_SUBDIRECTORY(emf)
-ADD_SUBDIRECTORY(fh)
-ADD_SUBDIRECTORY(idml)
-ADD_SUBDIRECTORY(odg)
-ADD_SUBDIRECTORY(oodraw)
-ADD_SUBDIRECTORY(pages)
-ADD_SUBDIRECTORY(pct)
-IF(HAVE_POPPLER)
- ADD_SUBDIRECTORY(pdf)
-ELSE()
- ADD_SUBDIRECTORY(ps)
-ENDIF()
-# ADD_SUBDIRECTORY(pgs)
-# ADD_SUBDIRECTORY(ppp)
-ADD_SUBDIRECTORY(pm)
-ADD_SUBDIRECTORY(pub)
-ADD_SUBDIRECTORY(shape)
-ADD_SUBDIRECTORY(sml)
-ADD_SUBDIRECTORY(svg)
-ADD_SUBDIRECTORY(svm)
-ADD_SUBDIRECTORY(uniconvertor)
-ADD_SUBDIRECTORY(viva)
-ADD_SUBDIRECTORY(vsd)
-ADD_SUBDIRECTORY(wmf)
-ADD_SUBDIRECTORY(wpg)
-ADD_SUBDIRECTORY(xar)
-ADD_SUBDIRECTORY(xfig)
-ADD_SUBDIRECTORY(xps)
+add_subdirectory(ai)
+add_subdirectory(cdr)
+add_subdirectory(cgm)
+add_subdirectory(cvg)
+add_subdirectory(drw)
+add_subdirectory(emf)
+add_subdirectory(fh)
+add_subdirectory(idml)
+add_subdirectory(odg)
+add_subdirectory(oodraw)
+add_subdirectory(pages)
+add_subdirectory(pct)
+if(HAVE_POPPLER)
+ add_subdirectory(pdf)
+else()
+ add_subdirectory(ps)
+endif()
+# add_subdirectory(pgs)
+# add_subdirectory(ppp)
+add_subdirectory(pm)
+add_subdirectory(pub)
+add_subdirectory(shape)
+add_subdirectory(sml)
+add_subdirectory(svg)
+add_subdirectory(svm)
+add_subdirectory(uniconvertor)
+add_subdirectory(viva)
+add_subdirectory(vsd)
+add_subdirectory(wmf)
+add_subdirectory(wpg)
+add_subdirectory(xar)
+add_subdirectory(xfig)
+add_subdirectory(xps)
Modified: trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/ai/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,53 +1,53 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${PODOFO_INCLUDES}
)
-IF(HAVE_PODOFO)
- INCLUDE_DIRECTORIES(
+if(HAVE_PODOFO)
+ include_directories(
${LIBPODOFO_INCLUDE_DIR}
)
-ENDIF()
+endif()
-SET(IMPORTAI_PLUGIN_MOC_CLASSES
+set(IMPORTAI_PLUGIN_MOC_CLASSES
importai.h
importaiplugin.h
)
-SET(IMPORTAI_PLUGIN_SOURCES
+set(IMPORTAI_PLUGIN_SOURCES
importai.cpp
importaiplugin.cpp
)
-SET(SCRIBUS_IMPORTAI_PLUGIN "importai")
+set(SCRIBUS_IMPORTAI_PLUGIN "importai")
QT5_WRAP_CPP(IMPORTAI_PLUGIN_MOC_SOURCES ${IMPORTAI_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTAI_PLUGIN} MODULE ${IMPORTAI_PLUGIN_SOURCES} ${IMPORTAI_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTAI_PLUGIN} MODULE ${IMPORTAI_PLUGIN_SOURCES} ${IMPORTAI_PLUGIN_MOC_SOURCES})
-IF(WIN32)
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTAI_PLUGIN}
+if(WIN32)
+ target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN}
${PLUGIN_LIBRARIES}
${TIFF_LIBRARIES}
${JPEG_LIBRARIES}
)
-ELSE()
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTAI_PLUGIN} ${PLUGIN_LIBRARIES})
-ENDIF()
+else()
+ target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN} ${PLUGIN_LIBRARIES})
+endif()
-IF(HAVE_PODOFO)
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTAI_PLUGIN}
+if(HAVE_PODOFO)
+ target_link_libraries(${SCRIBUS_IMPORTAI_PLUGIN}
${LIBPODOFO_LIBRARY}
)
-ENDIF()
+endif()
-INSTALL(TARGETS ${SCRIBUS_IMPORTAI_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTAI_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTAI_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTAI_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/cdr/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,38 +1,38 @@
-INCLUDE(FindPkgConfig)
-IF (HAVE_REVENGE)
+include(FindPkgConfig)
+if (HAVE_REVENGE)
pkg_check_modules(LIBCDR libcdr-0.1>=0.1)
- IF (LIBCDR_FOUND)
- MESSAGE("Building Corel Draw Importer with librevenge")
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
- SET(IMPORTCDR_PLUGIN_MOC_CLASSES importcdr.h importcdrplugin.h)
- SET(IMPORTCDR_PLUGIN_SOURCES ../revenge/rawpainter.cpp importcdr.cpp importcdrplugin.cpp)
- SET(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
+ if (LIBCDR_FOUND)
+ message("Building Corel Draw Importer with librevenge")
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
+ set(IMPORTCDR_PLUGIN_MOC_CLASSES importcdr.h importcdrplugin.h)
+ set(IMPORTCDR_PLUGIN_SOURCES ../revenge/rawpainter.cpp importcdr.cpp importcdrplugin.cpp)
+ set(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
QT5_WRAP_CPP(IMPORTCDR_PLUGIN_MOC_SOURCES ${IMPORTCDR_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES} ${IMPORTCDR_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
- ENDIF ()
-ELSE ()
+ add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES} ${IMPORTCDR_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
+ endif ()
+else ()
pkg_check_modules(LIBWPG libwpg-0.2)
- IF (LIBWPG_FOUND)
+ if (LIBWPG_FOUND)
pkg_check_modules(LIBWPD libwpd-0.9)
- IF (LIBWPD_FOUND)
+ if (LIBWPD_FOUND)
pkg_check_modules(LIBWPD_STREAM libwpd-stream-0.9)
- IF (LIBWPD_STREAM_FOUND)
+ if (LIBWPD_STREAM_FOUND)
pkg_check_modules(LIBCDR libcdr-0.0<=0.1)
- IF (LIBCDR_FOUND)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
- SET(IMPORTCDR_PLUGIN_MOC_CLASSES importcdr.h importcdrplugin.h)
- SET(IMPORTCDR_PLUGIN_SOURCES importcdr.cpp importcdrplugin.cpp)
- SET(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
+ if (LIBCDR_FOUND)
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBCDR_INCLUDE_DIRS})
+ set(IMPORTCDR_PLUGIN_MOC_CLASSES importcdr.h importcdrplugin.h)
+ set(IMPORTCDR_PLUGIN_SOURCES importcdr.cpp importcdrplugin.cpp)
+ set(SCRIBUS_IMPORTCDR_PLUGIN "importcdr")
QT5_WRAP_CPP(IMPORTCDR_PLUGIN_MOC_SOURCES ${IMPORTCDR_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES} ${IMPORTCDR_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
- ENDIF ()
- ENDIF ()
- ENDIF ()
- ENDIF ()
-ENDIF ()
+ add_library(${SCRIBUS_IMPORTCDR_PLUGIN} MODULE ${IMPORTCDR_PLUGIN_SOURCES} ${IMPORTCDR_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTCDR_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBCDR_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTCDR_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTCDR_PLUGIN} ${EXE_NAME})
+ endif ()
+ endif ()
+ endif ()
+ endif ()
+endif ()
Modified: trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/cgm/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTCGM_PLUGIN_MOC_CLASSES
+set(IMPORTCGM_PLUGIN_MOC_CLASSES
importcgm.h
importcgmplugin.h
)
-SET(IMPORTCGM_PLUGIN_SOURCES
+set(IMPORTCGM_PLUGIN_SOURCES
importcgm.cpp
importcgmplugin.cpp
)
-SET(SCRIBUS_IMPORTCGM_PLUGIN "importcgm")
+set(SCRIBUS_IMPORTCGM_PLUGIN "importcgm")
QT5_WRAP_CPP(IMPORTCGM_PLUGIN_MOC_SOURCES ${IMPORTCGM_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTCGM_PLUGIN} MODULE ${IMPORTCGM_PLUGIN_SOURCES} ${IMPORTCGM_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTCGM_PLUGIN} MODULE ${IMPORTCGM_PLUGIN_SOURCES} ${IMPORTCGM_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTCGM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTCGM_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTCGM_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTCGM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTCGM_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTCGM_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/cvg/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTCVG_PLUGIN_MOC_CLASSES
+set(IMPORTCVG_PLUGIN_MOC_CLASSES
importcvg.h
importcvgplugin.h
)
-SET(IMPORTCVG_PLUGIN_SOURCES
+set(IMPORTCVG_PLUGIN_SOURCES
importcvg.cpp
importcvgplugin.cpp
)
-SET(SCRIBUS_IMPORTCVG_PLUGIN "importcvg")
+set(SCRIBUS_IMPORTCVG_PLUGIN "importcvg")
QT5_WRAP_CPP(IMPORTCVG_PLUGIN_MOC_SOURCES ${IMPORTCVG_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTCVG_PLUGIN} MODULE ${IMPORTCVG_PLUGIN_SOURCES} ${IMPORTCVG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTCVG_PLUGIN} MODULE ${IMPORTCVG_PLUGIN_SOURCES} ${IMPORTCVG_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTCVG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTCVG_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTCVG_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTCVG_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTCVG_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTCVG_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/drw/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTDRW_PLUGIN_MOC_CLASSES
+set(IMPORTDRW_PLUGIN_MOC_CLASSES
importdrw.h
importdrwplugin.h
)
-SET(IMPORTDRW_PLUGIN_SOURCES
+set(IMPORTDRW_PLUGIN_SOURCES
importdrw.cpp
importdrwplugin.cpp
)
-SET(SCRIBUS_IMPORTDRW_PLUGIN "importdrw")
+set(SCRIBUS_IMPORTDRW_PLUGIN "importdrw")
QT5_WRAP_CPP(IMPORTDRW_PLUGIN_MOC_SOURCES ${IMPORTDRW_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTDRW_PLUGIN} MODULE ${IMPORTDRW_PLUGIN_SOURCES} ${IMPORTDRW_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTDRW_PLUGIN} MODULE ${IMPORTDRW_PLUGIN_SOURCES} ${IMPORTDRW_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTDRW_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTDRW_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTDRW_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTDRW_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTDRW_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTDRW_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/emf/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTEMF_PLUGIN_MOC_CLASSES
+set(IMPORTEMF_PLUGIN_MOC_CLASSES
importemf.h
importemfplugin.h
)
-SET(IMPORTEMF_PLUGIN_SOURCES
+set(IMPORTEMF_PLUGIN_SOURCES
importemf.cpp
importemfplugin.cpp
)
-SET(SCRIBUS_IMPORTEMF_PLUGIN "importemf")
+set(SCRIBUS_IMPORTEMF_PLUGIN "importemf")
QT5_WRAP_CPP(IMPORTEMF_PLUGIN_MOC_SOURCES ${IMPORTEMF_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTEMF_PLUGIN} MODULE ${IMPORTEMF_PLUGIN_SOURCES} ${IMPORTEMF_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTEMF_PLUGIN} MODULE ${IMPORTEMF_PLUGIN_SOURCES} ${IMPORTEMF_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTEMF_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTEMF_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTEMF_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTEMF_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTEMF_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTEMF_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/fh/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,16 +1,16 @@
-INCLUDE(FindPkgConfig)
-IF (HAVE_REVENGE)
+include(FindPkgConfig)
+if (HAVE_REVENGE)
pkg_check_modules(LIBFREEHAND libfreehand-0.1)
- IF (LIBFREEHAND_FOUND)
- MESSAGE("Building Freehand Importer with librevenge")
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBFREEHAND_INCLUDE_DIRS})
- SET(IMPORTFH_PLUGIN_MOC_CLASSES importfh.h importfhplugin.h)
- SET(IMPORTFH_PLUGIN_SOURCES ../revenge/rawpainter.cpp importfh.cpp importfhplugin.cpp)
- SET(SCRIBUS_IMPORTFH_PLUGIN "importfh")
+ if (LIBFREEHAND_FOUND)
+ message("Building Freehand Importer with librevenge")
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBFREEHAND_INCLUDE_DIRS})
+ set(IMPORTFH_PLUGIN_MOC_CLASSES importfh.h importfhplugin.h)
+ set(IMPORTFH_PLUGIN_SOURCES ../revenge/rawpainter.cpp importfh.cpp importfhplugin.cpp)
+ set(SCRIBUS_IMPORTFH_PLUGIN "importfh")
QT5_WRAP_CPP(IMPORTFH_PLUGIN_MOC_SOURCES ${IMPORTFH_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTFH_PLUGIN} MODULE ${IMPORTFH_PLUGIN_SOURCES} ${IMPORTFH_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTFH_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBFREEHAND_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTFH_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTFH_PLUGIN} ${EXE_NAME})
- ENDIF ()
-ENDIF ()
+ add_library(${SCRIBUS_IMPORTFH_PLUGIN} MODULE ${IMPORTFH_PLUGIN_SOURCES} ${IMPORTFH_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTFH_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBFREEHAND_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTFH_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTFH_PLUGIN} ${EXE_NAME})
+ endif ()
+endif ()
Modified: trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/idml/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTIDML_PLUGIN_MOC_CLASSES
+set(IMPORTIDML_PLUGIN_MOC_CLASSES
importidml.h
importidmlplugin.h
)
-SET(IMPORTIDML_PLUGIN_SOURCES
+set(IMPORTIDML_PLUGIN_SOURCES
importidml.cpp
importidmlplugin.cpp
)
-SET(SCRIBUS_IMPORTIDML_PLUGIN "importidml")
+set(SCRIBUS_IMPORTIDML_PLUGIN "importidml")
QT5_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTIDML_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTIDML_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTIDML_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/idml_old/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,34 +1,34 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTIDML_PLUGIN_MOC_CLASSES
+set(IMPORTIDML_PLUGIN_MOC_CLASSES
importidml.h
importidmlimpl.h
docpreference.h
)
-SET(IMPORTIDML_PLUGIN_SOURCES
+set(IMPORTIDML_PLUGIN_SOURCES
importidml.cpp
importidmlimpl.cpp
docpreference.cpp
)
-SET(SCRIBUS_IMPORTIDML_PLUGIN "importidml")
+set(SCRIBUS_IMPORTIDML_PLUGIN "importidml")
QT5_WRAP_CPP(IMPORTIDML_PLUGIN_MOC_SOURCES ${IMPORTIDML_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTIDML_PLUGIN} MODULE ${IMPORTIDML_PLUGIN_SOURCES} ${IMPORTIDML_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTIDML_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTIDML_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTIDML_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTIDML_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTIDML_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/odg/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,34 +1,34 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${ZLIB_INCLUDE_DIR}
)
-SET(IMPORTODG_PLUGIN_MOC_CLASSES
+set(IMPORTODG_PLUGIN_MOC_CLASSES
importodg.h
importodgplugin.h
)
-SET(IMPORTODG_PLUGIN_SOURCES
+set(IMPORTODG_PLUGIN_SOURCES
importodg.cpp
importodgplugin.cpp
)
-SET(SCRIBUS_IMPORTODG_PLUGIN "importodg")
+set(SCRIBUS_IMPORTODG_PLUGIN "importodg")
QT5_WRAP_CPP(IMPORTODG_PLUGIN_MOC_SOURCES ${IMPORTODG_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTODG_PLUGIN} MODULE ${IMPORTODG_PLUGIN_SOURCES} ${IMPORTODG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTODG_PLUGIN} MODULE ${IMPORTODG_PLUGIN_SOURCES} ${IMPORTODG_PLUGIN_MOC_SOURCES})
-LINK_DIRECTORIES( /usr/local/lib )
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTODG_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+link_directories( /usr/local/lib )
+target_link_libraries(${SCRIBUS_IMPORTODG_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
-INSTALL(TARGETS ${SCRIBUS_IMPORTODG_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTODG_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTODG_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTODG_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/oodraw/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,29 +1,29 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(OODRAW_FL_PLUGIN_MOC_CLASSES
+set(OODRAW_FL_PLUGIN_MOC_CLASSES
oodrawimp.h
)
-SET(OODRAW_FL_PLUGIN_SOURCES
+set(OODRAW_FL_PLUGIN_SOURCES
oodrawimp.cpp
stylestack.cpp
)
-SET(SCRIBUS_OODRAW_FL_PLUGIN "oodrawimp")
+set(SCRIBUS_OODRAW_FL_PLUGIN "oodrawimp")
QT5_WRAP_CPP(OODRAW_FL_PLUGIN_MOC_SOURCES ${OODRAW_FL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_OODRAW_FL_PLUGIN} MODULE ${OODRAW_FL_PLUGIN_SOURCES} ${OODRAW_FL_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_OODRAW_FL_PLUGIN} MODULE ${OODRAW_FL_PLUGIN_SOURCES} ${OODRAW_FL_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_OODRAW_FL_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_OODRAW_FL_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_OODRAW_FL_PLUGIN}
+install(TARGETS ${SCRIBUS_OODRAW_FL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pages/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,50 +1,50 @@
-#INCLUDE(FindPkgConfig)
-#IF (HAVE_REVENGE)
+#include(FindPkgConfig)
+#if (HAVE_REVENGE)
# pkg_check_modules(LIBETONYEK libetonyek-0.1)
-# IF (LIBETONYEK_FOUND)
-# MESSAGE("Building Pages Importer with librevenge")
-# INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBETONYEK_INCLUDE_DIRS})
-# SET(IMPORTPAGES_PLUGIN_MOC_CLASSES importpages.h importpagesplugin.h)
-# SET(IMPORTPAGES_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpages.cpp importpagesplugin.cpp)
-# SET(IMPORTPAGES_PLUGIN "importpages")
+# if (LIBETONYEK_FOUND)
+# message("Building Pages Importer with librevenge")
+# include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBETONYEK_INCLUDE_DIRS})
+# set(IMPORTPAGES_PLUGIN_MOC_CLASSES importpages.h importpagesplugin.h)
+# set(IMPORTPAGES_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpages.cpp importpagesplugin.cpp)
+# set(IMPORTPAGES_PLUGIN "importpages")
# QT5_WRAP_CPP(IMPORTPAGES_PLUGIN_MOC_SOURCES ${IMPORTPAGES_PLUGIN_MOC_CLASSES})
-# ADD_LIBRARY(${IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES} ${IMPORTPAGES_PLUGIN_MOC_SOURCES})
-# TARGET_LINK_LIBRARIES(${IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBETONYEK_LDFLAGS})
-# INSTALL(TARGETS ${IMPORTPAGES_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
-# ADD_DEPENDENCIES(${IMPORTPAGES_PLUGIN} ${EXE_NAME})
-# ENDIF ()
-#ENDIF ()
+# add_library(${IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES} ${IMPORTPAGES_PLUGIN_MOC_SOURCES})
+# target_link_libraries(${IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBETONYEK_LDFLAGS})
+# install(TARGETS ${IMPORTPAGES_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+# add_dependencies(${IMPORTPAGES_PLUGIN} ${EXE_NAME})
+# endif ()
+#endif ()
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${ZLIB_INCLUDE_DIR}
)
-SET(IMPORTPAGES_PLUGIN_MOC_CLASSES
+set(IMPORTPAGES_PLUGIN_MOC_CLASSES
importpages.h
importpagesplugin.h
)
-SET(IMPORTPAGES_PLUGIN_SOURCES
+set(IMPORTPAGES_PLUGIN_SOURCES
importpages.cpp
importpagesplugin.cpp
)
-SET(SCRIBUS_IMPORTPAGES_PLUGIN "importpages")
+set(SCRIBUS_IMPORTPAGES_PLUGIN "importpages")
QT5_WRAP_CPP(IMPORTPAGES_PLUGIN_MOC_SOURCES ${IMPORTPAGES_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES} ${IMPORTPAGES_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTPAGES_PLUGIN} MODULE ${IMPORTPAGES_PLUGIN_SOURCES} ${IMPORTPAGES_PLUGIN_MOC_SOURCES})
-LINK_DIRECTORIES( /usr/local/lib )
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+link_directories( /usr/local/lib )
+target_link_libraries(${SCRIBUS_IMPORTPAGES_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
-INSTALL(TARGETS ${SCRIBUS_IMPORTPAGES_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTPAGES_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTPAGES_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTPAGES_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pct/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTPCT_PLUGIN_MOC_CLASSES
+set(IMPORTPCT_PLUGIN_MOC_CLASSES
importpct.h
importpctplugin.h
)
-SET(IMPORTPCT_PLUGIN_SOURCES
+set(IMPORTPCT_PLUGIN_SOURCES
importpct.cpp
importpctplugin.cpp
)
-SET(SCRIBUS_IMPORTPCT_PLUGIN "importpct")
+set(SCRIBUS_IMPORTPCT_PLUGIN "importpct")
QT5_WRAP_CPP(IMPORTPCT_PLUGIN_MOC_SOURCES ${IMPORTPCT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTPCT_PLUGIN} MODULE ${IMPORTPCT_PLUGIN_SOURCES} ${IMPORTPCT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTPCT_PLUGIN} MODULE ${IMPORTPCT_PLUGIN_SOURCES} ${IMPORTPCT_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPCT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTPCT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTPCT_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTPCT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTPCT_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTPCT_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pdf/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,50 +1,50 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${POPPLER_INCLUDE_DIR}
)
-SET(IMPORTPDF_PLUGIN_UI_SRC
+set(IMPORTPDF_PLUGIN_UI_SRC
pdfimportoptions.ui
)
-SET(IMPORTPDF_PLUGIN_MOC_CLASSES
+set(IMPORTPDF_PLUGIN_MOC_CLASSES
importpdf.h
importpdfplugin.h
pdfimportoptions.h
)
-SET(IMPORTPDF_PLUGIN_SOURCES
+set(IMPORTPDF_PLUGIN_SOURCES
importpdf.cpp
importpdfplugin.cpp
pdfimportoptions.cpp
slaoutput.cpp
)
-IF(HAVE_POPPLER)
- IF(HAVE_LCMS1)
- ADD_DEFINITIONS(-DUSE_CMS)
- ENDIF()
- ADD_DEFINITIONS(-DHAVE_FREETYPE_H)
-ENDIF()
+if(HAVE_POPPLER)
+ if(HAVE_LCMS1)
+ add_definitions(-DUSE_CMS)
+ endif()
+ add_definitions(-DHAVE_FREETYPE_H)
+endif()
-SET(SCRIBUS_IMPORTPDF_PLUGIN "importpdf")
+set(SCRIBUS_IMPORTPDF_PLUGIN "importpdf")
QT5_WRAP_UI(IMPORTPDF_PLUGIN_UI_SOURCES ${IMPORTPDF_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(IMPORTPDF_PLUGIN_MOC_SOURCES ${IMPORTPDF_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTPDF_PLUGIN} MODULE ${IMPORTPDF_PLUGIN_SOURCES} ${IMPORTPDF_PLUGIN_MOC_SOURCES} ${IMPORTPDF_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_IMPORTPDF_PLUGIN} MODULE ${IMPORTPDF_PLUGIN_SOURCES} ${IMPORTPDF_PLUGIN_MOC_SOURCES} ${IMPORTPDF_PLUGIN_UI_SOURCES})
-LINK_DIRECTORIES( /usr/local/lib )
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPDF_PLUGIN} ${PLUGIN_LIBRARIES} ${POPPLER_LIBRARY})
+link_directories( /usr/local/lib )
+target_link_libraries(${SCRIBUS_IMPORTPDF_PLUGIN} ${PLUGIN_LIBRARIES} ${POPPLER_LIBRARY})
-INSTALL(TARGETS ${SCRIBUS_IMPORTPDF_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTPDF_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTPDF_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTPDF_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pm/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,16 +1,16 @@
-INCLUDE(FindPkgConfig)
-IF (HAVE_REVENGE)
+include(FindPkgConfig)
+if (HAVE_REVENGE)
pkg_check_modules(LIBPAGEMAKER libpagemaker-0.0)
- IF (LIBPAGEMAKER_FOUND)
- MESSAGE("Building Pagemaker Importer with librevenge")
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBPAGEMAKER_INCLUDE_DIRS})
- SET(IMPORTPM_PLUGIN_MOC_CLASSES importpm.h importpmplugin.h)
- SET(IMPORTPM_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpm.cpp importpmplugin.cpp)
- SET(SCRIBUS_IMPORTPM_PLUGIN "importpm")
+ if (LIBPAGEMAKER_FOUND)
+ message("Building Pagemaker Importer with librevenge")
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBPAGEMAKER_INCLUDE_DIRS})
+ set(IMPORTPM_PLUGIN_MOC_CLASSES importpm.h importpmplugin.h)
+ set(IMPORTPM_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpm.cpp importpmplugin.cpp)
+ set(SCRIBUS_IMPORTPM_PLUGIN "importpm")
QT5_WRAP_CPP(IMPORTPM_PLUGIN_MOC_SOURCES ${IMPORTPM_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTPM_PLUGIN} MODULE ${IMPORTPM_PLUGIN_SOURCES} ${IMPORTPM_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPM_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBPAGEMAKER_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTPM_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTPM_PLUGIN} ${EXE_NAME})
- ENDIF ()
-ENDIF ()
+ add_library(${SCRIBUS_IMPORTPM_PLUGIN} MODULE ${IMPORTPM_PLUGIN_SOURCES} ${IMPORTPM_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTPM_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBPAGEMAKER_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTPM_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTPM_PLUGIN} ${EXE_NAME})
+ endif ()
+endif ()
Modified: trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/ps/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,50 +1,50 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${PODOFO_INCLUDES}
)
-IF(HAVE_PODOFO)
- INCLUDE_DIRECTORIES(
+if(HAVE_PODOFO)
+ include_directories(
${LIBPODOFO_INCLUDE_DIR}
)
-ENDIF()
+endif()
-SET(IMPORTPS_PLUGIN_MOC_CLASSES
+set(IMPORTPS_PLUGIN_MOC_CLASSES
importps.h
importpsplugin.h
)
-SET(IMPORTPS_PLUGIN_SOURCES
+set(IMPORTPS_PLUGIN_SOURCES
importps.cpp
importpsplugin.cpp
)
-SET(SCRIBUS_IMPORTPS_PLUGIN "importps")
+set(SCRIBUS_IMPORTPS_PLUGIN "importps")
QT5_WRAP_CPP(IMPORTPS_PLUGIN_MOC_SOURCES ${IMPORTPS_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTPS_PLUGIN} MODULE ${IMPORTPS_PLUGIN_SOURCES} ${IMPORTPS_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTPS_PLUGIN} MODULE ${IMPORTPS_PLUGIN_SOURCES} ${IMPORTPS_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPS_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTPS_PLUGIN} ${PLUGIN_LIBRARIES})
-IF(HAVE_PODOFO)
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPS_PLUGIN}
+if(HAVE_PODOFO)
+ target_link_libraries(${SCRIBUS_IMPORTPS_PLUGIN}
${LIBPODOFO_LIBRARY}
)
-ENDIF()
+endif()
-INSTALL(TARGETS ${SCRIBUS_IMPORTPS_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTPS_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-INSTALL(FILES
+install(FILES
import.prolog
DESTINATION ${LIBDIR}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTPS_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTPS_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/pub/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,39 +1,39 @@
-INCLUDE(FindPkgConfig)
-IF (HAVE_REVENGE)
+include(FindPkgConfig)
+if (HAVE_REVENGE)
pkg_check_modules(LIBMSPUB libmspub-0.1>=0.1)
- IF (LIBMSPUB_FOUND)
- MESSAGE("Building MS Publisher Importer with librevenge")
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBMSPUB_INCLUDE_DIRS})
- SET(IMPORTPUB_PLUGIN_MOC_CLASSES importpub.h importpubplugin.h)
- SET(IMPORTPUB_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpub.cpp importpubplugin.cpp)
- SET(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
+ if (LIBMSPUB_FOUND)
+ message("Building MS Publisher Importer with librevenge")
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBMSPUB_INCLUDE_DIRS})
+ set(IMPORTPUB_PLUGIN_MOC_CLASSES importpub.h importpubplugin.h)
+ set(IMPORTPUB_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpub.cpp importpubplugin.cpp)
+ set(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
QT5_WRAP_CPP(IMPORTPUB_PLUGIN_MOC_SOURCES ${IMPORTPUB_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES} ${IMPORTPUB_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
- ENDIF ()
-ELSE ()
+ add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES} ${IMPORTPUB_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
+ endif ()
+else ()
pkg_check_modules(LIBMSPUB libmspub-0.0<=0.1)
- IF (LIBMSPUB_FOUND)
+ if (LIBMSPUB_FOUND)
pkg_check_modules(LIBWPG libwpg-0.2)
- IF (LIBWPG_FOUND)
+ if (LIBWPG_FOUND)
pkg_check_modules(LIBWPD libwpd-0.9)
- IF (LIBWPD_FOUND)
+ if (LIBWPD_FOUND)
pkg_check_modules(LIBWPD_STREAM libwpd-stream-0.9)
- IF (LIBWPD_STREAM_FOUND)
- MESSAGE("Building MS Publisher Importer without librevenge")
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBMSPUB_INCLUDE_DIRS})
- SET(IMPORTPUB_PLUGIN_MOC_CLASSES importpub.h importpubplugin.h)
- SET(IMPORTPUB_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpub.cpp importpubplugin.cpp)
- SET(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
+ if (LIBWPD_STREAM_FOUND)
+ message("Building MS Publisher Importer without librevenge")
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBMSPUB_INCLUDE_DIRS})
+ set(IMPORTPUB_PLUGIN_MOC_CLASSES importpub.h importpubplugin.h)
+ set(IMPORTPUB_PLUGIN_SOURCES ../revenge/rawpainter.cpp importpub.cpp importpubplugin.cpp)
+ set(SCRIBUS_IMPORTPUB_PLUGIN "importpub")
QT5_WRAP_CPP(IMPORTPUB_PLUGIN_MOC_SOURCES ${IMPORTPUB_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES} ${IMPORTPUB_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
- ENDIF ()
- ENDIF ()
- ENDIF ()
- ENDIF ()
-ENDIF ()
+ add_library(${SCRIBUS_IMPORTPUB_PLUGIN} MODULE ${IMPORTPUB_PLUGIN_SOURCES} ${IMPORTPUB_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTPUB_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBMSPUB_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTPUB_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTPUB_PLUGIN} ${EXE_NAME})
+ endif ()
+ endif ()
+ endif ()
+ endif ()
+endif ()
Modified: trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/shape/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTSHAPE_PLUGIN_MOC_CLASSES
+set(IMPORTSHAPE_PLUGIN_MOC_CLASSES
importshape.h
importshapeplugin.h
)
-SET(IMPORTSHAPE_PLUGIN_SOURCES
+set(IMPORTSHAPE_PLUGIN_SOURCES
importshape.cpp
importshapeplugin.cpp
)
-SET(SCRIBUS_IMPORTSHAPE_PLUGIN "importshape")
+set(SCRIBUS_IMPORTSHAPE_PLUGIN "importshape")
QT5_WRAP_CPP(IMPORTSHAPE_PLUGIN_MOC_SOURCES ${IMPORTSHAPE_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTSHAPE_PLUGIN} MODULE ${IMPORTSHAPE_PLUGIN_SOURCES} ${IMPORTSHAPE_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSHAPE_PLUGIN} MODULE ${IMPORTSHAPE_PLUGIN_SOURCES} ${IMPORTSHAPE_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTSHAPE_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTSHAPE_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTSHAPE_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/sml/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTSML_PLUGIN_MOC_CLASSES
+set(IMPORTSML_PLUGIN_MOC_CLASSES
importsml.h
importsmlplugin.h
)
-SET(IMPORTSML_PLUGIN_SOURCES
+set(IMPORTSML_PLUGIN_SOURCES
importsml.cpp
importsmlplugin.cpp
)
-SET(SCRIBUS_IMPORTSML_PLUGIN "importsml")
+set(SCRIBUS_IMPORTSML_PLUGIN "importsml")
QT5_WRAP_CPP(IMPORTSML_PLUGIN_MOC_SOURCES ${IMPORTSML_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTSML_PLUGIN} MODULE ${IMPORTSML_PLUGIN_SOURCES} ${IMPORTSML_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSML_PLUGIN} MODULE ${IMPORTSML_PLUGIN_SOURCES} ${IMPORTSML_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTSML_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSML_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTSML_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTSML_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTSML_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTSML_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/svg/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTSVG_PLUGIN_MOC_CLASSES
+set(IMPORTSVG_PLUGIN_MOC_CLASSES
svgplugin.h
)
-SET(IMPORTSVG_PLUGIN_SOURCES
+set(IMPORTSVG_PLUGIN_SOURCES
svgplugin.cpp
)
-SET(SCRIBUS_IMPORTSVG_PLUGIN "svgimplugin")
+set(SCRIBUS_IMPORTSVG_PLUGIN "svgimplugin")
QT5_WRAP_CPP(IMPORTSVG_PLUGIN_MOC_SOURCES ${IMPORTSVG_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTSVG_PLUGIN} MODULE ${IMPORTSVG_PLUGIN_SOURCES} ${IMPORTSVG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSVG_PLUGIN} MODULE ${IMPORTSVG_PLUGIN_SOURCES} ${IMPORTSVG_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSVG_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTSVG_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTSVG_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTSVG_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTSVG_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/svm/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTSVM_PLUGIN_MOC_CLASSES
+set(IMPORTSVM_PLUGIN_MOC_CLASSES
importsvm.h
importsvmplugin.h
)
-SET(IMPORTSVM_PLUGIN_SOURCES
+set(IMPORTSVM_PLUGIN_SOURCES
importsvm.cpp
importsvmplugin.cpp
)
-SET(SCRIBUS_IMPORTSVM_PLUGIN "importsvm")
+set(SCRIBUS_IMPORTSVM_PLUGIN "importsvm")
QT5_WRAP_CPP(IMPORTSVM_PLUGIN_MOC_SOURCES ${IMPORTSVM_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTSVM_PLUGIN} MODULE ${IMPORTSVM_PLUGIN_SOURCES} ${IMPORTSVM_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTSVM_PLUGIN} MODULE ${IMPORTSVM_PLUGIN_SOURCES} ${IMPORTSVM_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTSVM_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTSVM_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTSVM_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTSVM_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTSVM_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTSVM_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/uniconvertor/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES
+set(IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES
uniconvplugin.h
)
-SET(IMPORTUNICONVERTOR_PLUGIN_SOURCES
+set(IMPORTUNICONVERTOR_PLUGIN_SOURCES
uniconvplugin.cpp
)
-SET(SCRIBUS_IMPORTUNICONVERTOR_PLUGIN "uniconvertorplugin")
+set(SCRIBUS_IMPORTUNICONVERTOR_PLUGIN "uniconvertorplugin")
QT5_WRAP_CPP(IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES ${IMPORTUNICONVERTOR_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} MODULE ${IMPORTUNICONVERTOR_PLUGIN_SOURCES} ${IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} MODULE ${IMPORTUNICONVERTOR_PLUGIN_SOURCES} ${IMPORTUNICONVERTOR_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTUNICONVERTOR_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/viva/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTVIVA_PLUGIN_MOC_CLASSES
+set(IMPORTVIVA_PLUGIN_MOC_CLASSES
importviva.h
importvivaplugin.h
)
-SET(IMPORTVIVA_PLUGIN_SOURCES
+set(IMPORTVIVA_PLUGIN_SOURCES
importviva.cpp
importvivaplugin.cpp
)
-SET(SCRIBUS_IMPORTVIVA_PLUGIN "importviva")
+set(SCRIBUS_IMPORTVIVA_PLUGIN "importviva")
QT5_WRAP_CPP(IMPORTVIVA_PLUGIN_MOC_SOURCES ${IMPORTVIVA_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTVIVA_PLUGIN} MODULE ${IMPORTVIVA_PLUGIN_SOURCES} ${IMPORTVIVA_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTVIVA_PLUGIN} MODULE ${IMPORTVIVA_PLUGIN_SOURCES} ${IMPORTVIVA_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTVIVA_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTVIVA_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTVIVA_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTVIVA_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTVIVA_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTVIVA_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/vsd/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,38 +1,38 @@
-INCLUDE(FindPkgConfig)
-IF (HAVE_REVENGE)
+include(FindPkgConfig)
+if (HAVE_REVENGE)
pkg_check_modules(LIBVISIO libvisio-0.1>=0.1)
- IF (LIBVISIO_FOUND)
- MESSAGE("Building MS-Visio Importer with librevenge")
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
- SET(IMPORTVSD_PLUGIN_MOC_CLASSES importvsd.h importvsdplugin.h)
- SET(IMPORTVSD_PLUGIN_SOURCES ../revenge/rawpainter.cpp importvsd.cpp importvsdplugin.cpp)
- SET(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
+ if (LIBVISIO_FOUND)
+ message("Building MS-Visio Importer with librevenge")
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBREVENGE_INCLUDE_DIRS} ${LIBREVENGE_GENERATORS_INCLUDE_DIRS} ${LIBREVENGE_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
+ set(IMPORTVSD_PLUGIN_MOC_CLASSES importvsd.h importvsdplugin.h)
+ set(IMPORTVSD_PLUGIN_SOURCES ../revenge/rawpainter.cpp importvsd.cpp importvsdplugin.cpp)
+ set(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
QT5_WRAP_CPP(IMPORTVSD_PLUGIN_MOC_SOURCES ${IMPORTVSD_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES} ${IMPORTVSD_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
- ENDIF ()
-ELSE ()
+ add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES} ${IMPORTVSD_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBREVENGE_LDFLAGS} ${LIBREVENGE_GENERATORS_LDFLAGS} ${LIBREVENGE_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
+ endif ()
+else ()
pkg_check_modules(LIBWPG libwpg-0.2)
- IF (LIBWPG_FOUND)
+ if (LIBWPG_FOUND)
pkg_check_modules(LIBWPD libwpd-0.9)
- IF (LIBWPD_FOUND)
+ if (LIBWPD_FOUND)
pkg_check_modules(LIBWPD_STREAM libwpd-stream-0.9)
- IF (LIBWPD_STREAM_FOUND)
+ if (LIBWPD_STREAM_FOUND)
pkg_check_modules(LIBVISIO libvisio-0.0<=0.1)
- IF (LIBVISIO_FOUND)
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
- SET(IMPORTVSD_PLUGIN_MOC_CLASSES importvsd.h importvsdplugin.h)
- SET(IMPORTVSD_PLUGIN_SOURCES ../revenge/rawpainter.cpp importvsd.cpp importvsdplugin.cpp)
- SET(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
+ if (LIBVISIO_FOUND)
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/scribus ${LIBWPG_INCLUDE_DIRS} ${LIBWPD_INCLUDE_DIRS} ${LIBWPD_STREAM_INCLUDE_DIRS} ${LIBVISIO_INCLUDE_DIRS})
+ set(IMPORTVSD_PLUGIN_MOC_CLASSES importvsd.h importvsdplugin.h)
+ set(IMPORTVSD_PLUGIN_SOURCES ../revenge/rawpainter.cpp importvsd.cpp importvsdplugin.cpp)
+ set(SCRIBUS_IMPORTVSD_PLUGIN "importvsd")
QT5_WRAP_CPP(IMPORTVSD_PLUGIN_MOC_SOURCES ${IMPORTVSD_PLUGIN_MOC_CLASSES})
- ADD_LIBRARY(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES} ${IMPORTVSD_PLUGIN_MOC_SOURCES})
- TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
- INSTALL(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
- ADD_DEPENDENCIES(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
- ENDIF ()
- ENDIF ()
- ENDIF ()
- ENDIF ()
-ENDIF ()
+ add_library(${SCRIBUS_IMPORTVSD_PLUGIN} MODULE ${IMPORTVSD_PLUGIN_SOURCES} ${IMPORTVSD_PLUGIN_MOC_SOURCES})
+ target_link_libraries(${SCRIBUS_IMPORTVSD_PLUGIN} ${PLUGIN_LIBRARIES} ${LIBWPG_LDFLAGS} ${LIBWPD_LDFLAGS} ${LIBWPD_STREAM_LDFLAGS} ${LIBVISIO_LDFLAGS})
+ install(TARGETS ${SCRIBUS_IMPORTVSD_PLUGIN} LIBRARY DESTINATION ${PLUGINDIR} PERMISSIONS ${PLUGIN_PERMISSIONS})
+ add_dependencies(${SCRIBUS_IMPORTVSD_PLUGIN} ${EXE_NAME})
+ endif ()
+ endif ()
+ endif ()
+ endif ()
+endif ()
Modified: trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/wmf/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,28 +1,28 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTWMF_PLUGIN_MOC_CLASSES
+set(IMPORTWMF_PLUGIN_MOC_CLASSES
wmfimport.h
wmfimportplugin.h
)
-SET(IMPORTWMF_PLUGIN_SOURCES
+set(IMPORTWMF_PLUGIN_SOURCES
wmfcontext.cpp
wmfimport.cpp
wmfimportplugin.cpp
)
-SET(SCRIBUS_IMPORTWMF_PLUGIN "wmfimplugin")
+set(SCRIBUS_IMPORTWMF_PLUGIN "wmfimplugin")
QT5_WRAP_CPP(IMPORTWMF_PLUGIN_MOC_SOURCES ${IMPORTWMF_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTWMF_PLUGIN} MODULE ${IMPORTWMF_PLUGIN_SOURCES} ${IMPORTWMF_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTWMF_PLUGIN} MODULE ${IMPORTWMF_PLUGIN_SOURCES} ${IMPORTWMF_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTWMF_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTWMF_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTWMF_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTWMF_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/wpg/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,25 +1,25 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTWPG_PLUGIN_MOC_CLASSES
+set(IMPORTWPG_PLUGIN_MOC_CLASSES
importwpg.h
importwpgplugin.h
)
-SET(IMPORTWPG_PLUGIN_SOURCES
+set(IMPORTWPG_PLUGIN_SOURCES
importwpg.cpp
importwpgplugin.cpp
)
-SET(SCRIBUS_IMPORTWPG_PLUGIN "importwpg")
+set(SCRIBUS_IMPORTWPG_PLUGIN "importwpg")
QT5_WRAP_CPP(IMPORTWPG_PLUGIN_MOC_SOURCES ${IMPORTWPG_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTWPG_PLUGIN} MODULE ${IMPORTWPG_PLUGIN_SOURCES} ${IMPORTWPG_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTWPG_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTWPG_PLUGIN}
+add_library(${SCRIBUS_IMPORTWPG_PLUGIN} MODULE ${IMPORTWPG_PLUGIN_SOURCES} ${IMPORTWPG_PLUGIN_MOC_SOURCES})
+target_link_libraries(${SCRIBUS_IMPORTWPG_PLUGIN} ${PLUGIN_LIBRARIES})
+install(TARGETS ${SCRIBUS_IMPORTWPG_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTWPG_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTWPG_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/xar/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTXAR_PLUGIN_MOC_CLASSES
+set(IMPORTXAR_PLUGIN_MOC_CLASSES
# qtiocompressor.h
importxar.h
importxarplugin.h
)
-SET(IMPORTXAR_PLUGIN_SOURCES
+set(IMPORTXAR_PLUGIN_SOURCES
# qtiocompressor.cpp
importxar.cpp
importxarplugin.cpp
)
-SET(SCRIBUS_IMPORTXAR_PLUGIN "importxar")
+set(SCRIBUS_IMPORTXAR_PLUGIN "importxar")
QT5_WRAP_CPP(IMPORTXAR_PLUGIN_MOC_SOURCES ${IMPORTXAR_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTXAR_PLUGIN} MODULE ${IMPORTXAR_PLUGIN_SOURCES} ${IMPORTXAR_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTXAR_PLUGIN} MODULE ${IMPORTXAR_PLUGIN_SOURCES} ${IMPORTXAR_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTXAR_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTXAR_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTXAR_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTXAR_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTXAR_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTXAR_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/xfig/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPORTXFIG_PLUGIN_MOC_CLASSES
+set(IMPORTXFIG_PLUGIN_MOC_CLASSES
importxfig.h
importxfigplugin.h
)
-SET(IMPORTXFIG_PLUGIN_SOURCES
+set(IMPORTXFIG_PLUGIN_SOURCES
importxfig.cpp
importxfigplugin.cpp
)
-SET(SCRIBUS_IMPORTXFIG_PLUGIN "importxfig")
+set(SCRIBUS_IMPORTXFIG_PLUGIN "importxfig")
QT5_WRAP_CPP(IMPORTXFIG_PLUGIN_MOC_SOURCES ${IMPORTXFIG_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTXFIG_PLUGIN} MODULE ${IMPORTXFIG_PLUGIN_SOURCES} ${IMPORTXFIG_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_IMPORTXFIG_PLUGIN} MODULE ${IMPORTXFIG_PLUGIN_SOURCES} ${IMPORTXFIG_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTXFIG_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPORTXFIG_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPORTXFIG_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTXFIG_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTXFIG_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTXFIG_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/import/xps/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,42 +1,42 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${ZLIB_INCLUDE_DIR}
)
-SET(IMPORTXPS_PLUGIN_UI_SRC
+set(IMPORTXPS_PLUGIN_UI_SRC
xpsimportoptions.ui
)
-SET(IMPORTXPS_PLUGIN_MOC_CLASSES
+set(IMPORTXPS_PLUGIN_MOC_CLASSES
importxps.h
importxpsplugin.h
xpsimportoptions.h
)
-SET(IMPORTXPS_PLUGIN_SOURCES
+set(IMPORTXPS_PLUGIN_SOURCES
importxps.cpp
importxpsplugin.cpp
xpsimportoptions.cpp
)
-SET(SCRIBUS_IMPORTXPS_PLUGIN "importxps")
+set(SCRIBUS_IMPORTXPS_PLUGIN "importxps")
QT5_WRAP_UI(IMPORTXPS_PLUGIN_UI_SOURCES ${IMPORTXPS_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(IMPORTXPS_PLUGIN_MOC_SOURCES ${IMPORTXPS_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPORTXPS_PLUGIN} MODULE ${IMPORTXPS_PLUGIN_SOURCES} ${IMPORTXPS_PLUGIN_MOC_SOURCES} ${IMPORTXPS_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_IMPORTXPS_PLUGIN} MODULE ${IMPORTXPS_PLUGIN_SOURCES} ${IMPORTXPS_PLUGIN_MOC_SOURCES} ${IMPORTXPS_PLUGIN_UI_SOURCES})
-LINK_DIRECTORIES( /usr/local/lib )
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
+link_directories( /usr/local/lib )
+target_link_libraries(${SCRIBUS_IMPORTXPS_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_ZIP_LIB})
-INSTALL(TARGETS ${SCRIBUS_IMPORTXPS_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPORTXPS_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPORTXPS_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPORTXPS_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/imposition/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,37 +1,37 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(IMPOSITION_PLUGIN_UI_SRC
+set(IMPOSITION_PLUGIN_UI_SRC
impositionbase.ui
)
-SET(IMPOSITION_PLUGIN_MOC_CLASSES
+set(IMPOSITION_PLUGIN_MOC_CLASSES
imposition.h
impositionplugin.h
)
-SET(IMPOSITION_PLUGIN_SOURCES
+set(IMPOSITION_PLUGIN_SOURCES
imposition.cpp
impositionplugin.cpp
)
-SET(SCRIBUS_IMPOSITION_PLUGIN "imposition")
+set(SCRIBUS_IMPOSITION_PLUGIN "imposition")
QT5_WRAP_UI(IMPOSITION_PLUGIN_UI_SOURCES ${IMPOSITION_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(IMPOSITION_PLUGIN_MOC_SOURCES ${IMPOSITION_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_IMPOSITION_PLUGIN} MODULE ${IMPOSITION_PLUGIN_SOURCES} ${IMPOSITION_PLUGIN_MOC_SOURCES} ${IMPOSITION_PLUGIN_UI_CPP} ${IMPOSITION_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_IMPOSITION_PLUGIN} MODULE ${IMPOSITION_PLUGIN_SOURCES} ${IMPOSITION_PLUGIN_MOC_SOURCES} ${IMPOSITION_PLUGIN_UI_CPP} ${IMPOSITION_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_IMPOSITION_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_IMPOSITION_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_IMPOSITION_PLUGIN}
+install(TARGETS ${SCRIBUS_IMPOSITION_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_IMPOSITION_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_IMPOSITION_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_IMPOSITION_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_IMPOSITION_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/myplugin/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(MY_PLUGIN_MOC_CLASSES
+set(MY_PLUGIN_MOC_CLASSES
myplugin.h
mypluginimpl.h
)
-SET(MY_PLUGIN_SOURCES
+set(MY_PLUGIN_SOURCES
myplugin.cpp
mypluginimpl.cpp
)
-SET(SCRIBUS_MY_PLUGIN "myplugin")
+set(SCRIBUS_MY_PLUGIN "myplugin")
QT5_WRAP_CPP(MY_PLUGIN_MOC_SOURCES ${MY_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_MY_PLUGIN} MODULE ${MY_PLUGIN_SOURCES} ${MY_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_MY_PLUGIN} MODULE ${MY_PLUGIN_SOURCES} ${MY_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_MY_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_MY_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_MY_PLUGIN}
+install(TARGETS ${SCRIBUS_MY_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/newfromtemplateplugin/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,18 +1,18 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(NEWFROMTEMPLATE_PLUGIN_UI_SRC
+set(NEWFROMTEMPLATE_PLUGIN_UI_SRC
nftdialog.ui
)
-SET(NEWFROMTEMPLATE_PLUGIN_MOC_CLASSES
+set(NEWFROMTEMPLATE_PLUGIN_MOC_CLASSES
nftdialog.h
nftemplate.h
)
-SET(NEWFROMTEMPLATE_PLUGIN_SOURCES
+set(NEWFROMTEMPLATE_PLUGIN_SOURCES
nftdialog.cpp
nftemplate.cpp
nftrcreader.cpp
@@ -20,22 +20,22 @@
nfttemplate.cpp
)
-SET(SCRIBUS_NEWFROMTEMPLATE_PLUGIN "newfromtemplateplugin")
+set(SCRIBUS_NEWFROMTEMPLATE_PLUGIN "newfromtemplateplugin")
QT5_WRAP_UI(NEWFROMTEMPLATE_PLUGIN_UI_SOURCES ${NEWFROMTEMPLATE_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(NEWFROMTEMPLATE_PLUGIN_MOC_SOURCES ${NEWFROMTEMPLATE_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_NEWFROMTEMPLATE_PLUGIN} MODULE
+add_library(${SCRIBUS_NEWFROMTEMPLATE_PLUGIN} MODULE
${NEWFROMTEMPLATE_PLUGIN_SOURCES}
${NEWFROMTEMPLATE_PLUGIN_MOC_SOURCES}
${NEWFROMTEMPLATE_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_NEWFROMTEMPLATE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_NEWFROMTEMPLATE_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_NEWFROMTEMPLATE_PLUGIN}
+install(TARGETS ${SCRIBUS_NEWFROMTEMPLATE_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/picbrowser/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,14 +1,14 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(PICTUREBROWSER_PLUGIN_UI_SRC
+set(PICTUREBROWSER_PLUGIN_UI_SRC
picturebrowser.ui
imagedialog.ui
)
-SET(PICTUREBROWSER_PLUGIN_MOC_CLASSES
+set(PICTUREBROWSER_PLUGIN_MOC_CLASSES
collection.h
findimage.h
imagedialog.h
@@ -19,7 +19,7 @@
previewimage.h
)
-SET(PICTUREBROWSER_PLUGIN_SOURCES
+set(PICTUREBROWSER_PLUGIN_SOURCES
collection.cpp
findimage.cpp
imagedialog.cpp
@@ -32,26 +32,26 @@
previewimage.cpp
)
-SET(SCRIBUS_PICTUREBROWSER_PLUGIN "picturebrowser")
+set(SCRIBUS_PICTUREBROWSER_PLUGIN "picturebrowser")
QT5_WRAP_UI(PICTUREBROWSER_PLUGIN_UI_SOURCES ${PICTUREBROWSER_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(PICTUREBROWSER_PLUGIN_MOC_SOURCES ${PICTUREBROWSER_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_PICTUREBROWSER_PLUGIN} MODULE ${PICTUREBROWSER_PLUGIN_SOURCES}
+add_library(${SCRIBUS_PICTUREBROWSER_PLUGIN} MODULE ${PICTUREBROWSER_PLUGIN_SOURCES}
${PICTUREBROWSER_PLUGIN_MOC_SOURCES} ${PICTUREBROWSER_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PICTUREBROWSER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PICTUREBROWSER_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_PICTUREBROWSER_PLUGIN}
+install(TARGETS ${SCRIBUS_PICTUREBROWSER_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-INSTALL(FILES icons/pitr_green_arrows_set_1.svg icons/pitr_green_arrows_set_5.svg icons/sarxos_Paper_Sheets.svg icons/sarxos_Simple_Folder_Seek.svg icons/sarxos_Simple_Green_Yellow_Blue_Violet_Folders.svg icons/testfill.png
+install(FILES icons/pitr_green_arrows_set_1.svg icons/pitr_green_arrows_set_5.svg icons/sarxos_Paper_Sheets.svg icons/sarxos_Simple_Folder_Seek.svg icons/sarxos_Simple_Green_Yellow_Blue_Violet_Folders.svg icons/testfill.png
DESTINATION ${SHAREDIR}/icons
)
-INSTALL(FILES collectionsdb.xml DESTINATION ${SHAREDIR}/plugins)
+install(FILES collectionsdb.xml DESTINATION ${SHAREDIR}/plugins)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/saveastemplateplugin/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,36 +1,36 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SAVEASTEMPLATE_PLUGIN_UI_SRC
+set(SAVEASTEMPLATE_PLUGIN_UI_SRC
satdialog.ui
)
-SET(SAVEASTEMPLATE_PLUGIN_MOC_CLASSES
+set(SAVEASTEMPLATE_PLUGIN_MOC_CLASSES
satdialog.h
satemplate.h
)
-SET(SAVEASTEMPLATE_PLUGIN_SOURCES
+set(SAVEASTEMPLATE_PLUGIN_SOURCES
satdialog.cpp
satemplate.cpp
)
-SET(SCRIBUS_SAVEASTEMPLATE_PLUGIN "saveastemplateplugin")
+set(SCRIBUS_SAVEASTEMPLATE_PLUGIN "saveastemplateplugin")
QT5_WRAP_UI(SAVEASTEMPLATE_PLUGIN_UI_SOURCES ${SAVEASTEMPLATE_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(SAVEASTEMPLATE_PLUGIN_MOC_SOURCES ${SAVEASTEMPLATE_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} MODULE ${SAVEASTEMPLATE_PLUGIN_SOURCES}
+add_library(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} MODULE ${SAVEASTEMPLATE_PLUGIN_SOURCES}
${SAVEASTEMPLATE_PLUGIN_MOC_SOURCES} ${SAVEASTEMPLATE_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SAVEASTEMPLATE_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SAVEASTEMPLATE_PLUGIN}
+install(TARGETS ${SCRIBUS_SAVEASTEMPLATE_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scripter/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,10 +1,10 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${PYTHON_INCLUDE_PATH}
)
-SET(SCRIPTER_PLUGIN_MOC_CLASSES
+set(SCRIPTER_PLUGIN_MOC_CLASSES
scripter.h
scripterimpl.h
api_prefs.h
@@ -21,7 +21,7 @@
api_color.h
)
-SET(SCRIPTER_PLUGIN_SOURCES
+set(SCRIPTER_PLUGIN_SOURCES
scripter.cpp
scripterimpl.cpp
pythonize.cpp
@@ -41,53 +41,53 @@
)
-#SET(PYTHONIZE "pythonize")
-#SET(PYTHONIZE_SOURCES "pythonize.cpp")
-#ADD_LIBRARY(${PYTHONIZE} SHARED ${PYTHONIZE_SOURCES})
-#TARGET_LINK_LIBRARIES(${PYTHONIZE} ${PYTHON_LIBRARIES})
-#INSTALL(TARGETS ${PYTHONIZE}
+#set(PYTHONIZE "pythonize")
+#set(PYTHONIZE_SOURCES "pythonize.cpp")
+#add_library(${PYTHONIZE} SHARED ${PYTHONIZE_SOURCES})
+#target_link_libraries(${PYTHONIZE} ${PYTHON_LIBRARIES})
+#install(TARGETS ${PYTHONIZE}
# LIBRARY
# DESTINATION ${PLUGINDIR}
# PERMISSIONS ${PLUGIN_PERMISSIONS}
#)
-SET(SCRIBUS_SCRIPTER_PLUGIN "scripter")
+set(SCRIBUS_SCRIPTER_PLUGIN "scripter")
QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SCRIPTER_PLUGIN} MODULE ${SCRIPTER_PLUGIN_SOURCES} ${SCRIPTER_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SCRIPTER_PLUGIN} MODULE ${SCRIPTER_PLUGIN_SOURCES} ${SCRIPTER_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCRIPTER_PLUGIN}
+target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN}
${PYTHON_LIBRARIES}
)
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SCRIPTER_PLUGIN}
+install(TARGETS ${SCRIBUS_SCRIPTER_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-FILE(GLOB pyfiles "python/*.py")
-INSTALL(FILES ${pyfiles}
+file(GLOB pyfiles "python/*.py")
+install(FILES ${pyfiles}
DESTINATION ${PLUGINDIR}/scripter
)
-FILE(GLOB autoload "python/autoload/*.py" "python/autoload/*.spy" "python/autoload/*.js" "python/autoload/*.sqts" "python/autoload/*.sjs")
-INSTALL(FILES ${autoload}
+file(GLOB autoload "python/autoload/*.py" "python/autoload/*.spy" "python/autoload/*.js" "python/autoload/*.sqts" "python/autoload/*.sjs")
+install(FILES ${autoload}
DESTINATION ${PLUGINDIR}/scripter/autoload
)
-FILE(GLOB examples "python/examples/*.py" "python/examples/*.spy" "python/examples/*.js" "python/examples/*.sqts" "python/examples/*.sjs")
-INSTALL(FILES ${examples}
+file(GLOB examples "python/examples/*.py" "python/examples/*.spy" "python/examples/*.js" "python/examples/*.sqts" "python/examples/*.sjs")
+install(FILES ${examples}
DESTINATION ${PLUGINDIR}/scripter/examples
)
-FILE(GLOB sceditor "python/sceditor/*.zip" "python/sceditor/*.png" "python/sceditor/*.py")
-INSTALL(FILES ${sceditor}
+file(GLOB sceditor "python/sceditor/*.zip" "python/sceditor/*.png" "python/sceditor/*.py")
+install(FILES ${sceditor}
DESTINATION ${PLUGINDIR}/scripter/sceditor
)
-ADD_DEPENDENCIES(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,23 +1,23 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${PYTHON_INCLUDE_PATH}
)
# Gentoo has an option for no examples. Let's make the ebuild simpler and open up the option to others, but leave as a default for us
-IF (NOT WANT_NOEXAMPLES)
- ADD_SUBDIRECTORY(samples)
-ENDIF ()
-ADD_SUBDIRECTORY(scripts)
+if (NOT WANT_NOEXAMPLES)
+ add_subdirectory(samples)
+endif ()
+add_subdirectory(scripts)
-SET(SCRIPTER_PLUGIN_UI_SRC
+set(SCRIPTER_PLUGIN_UI_SRC
pconsole.ui
runscriptdialog.ui
scripterprefsgui.ui
prefs_scripterbase.ui
)
-SET(SCRIPTER_PLUGIN_MOC_CLASSES
+set(SCRIPTER_PLUGIN_MOC_CLASSES
pconsole.h
scriptplugin.h
scriptercore.h
@@ -26,7 +26,7 @@
prefs_scripter.h
)
-SET(SCRIPTER_PLUGIN_SOURCES
+set(SCRIPTER_PLUGIN_SOURCES
cmdcell.cpp
cmdcolor.cpp
cmddialog.cpp
@@ -55,29 +55,29 @@
svgimport.cpp
)
-SET(SCRIBUS_SCRIPTER_PLUGIN "scriptplugin")
+set(SCRIBUS_SCRIPTER_PLUGIN "scriptplugin")
QT5_WRAP_UI(SCRIPTER_PLUGIN_UI_SOURCES ${SCRIPTER_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(SCRIPTER_PLUGIN_MOC_SOURCES ${SCRIPTER_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SCRIPTER_PLUGIN} MODULE
+add_library(${SCRIBUS_SCRIPTER_PLUGIN} MODULE
${SCRIPTER_PLUGIN_SOURCES}
${SCRIPTER_PLUGIN_MOC_SOURCES}
${SCRIPTER_PLUGIN_UI_SOURCES}
)
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCRIPTER_PLUGIN}
+target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN}
${PYTHON_LIBRARIES}
)
-TARGET_LINK_LIBRARIES(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SCRIPTER_PLUGIN}
+install(TARGETS ${SCRIBUS_SCRIPTER_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_SCRIPTER_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_SCRIPTER_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_SCRIPTER_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/scriptplugin/samples/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/scriptplugin/samples/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/samples/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/samples/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
3columnUSLTR.py
3columnA4.py
boilerplate.py
Modified: trunk/Scribus/scribus/plugins/scriptplugin/scripts/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/scriptplugin/scripts/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/scripts/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/scripts/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
"${CMAKE_SOURCE_DIR}/scribus"
)
-INSTALL(FILES
+install(FILES
Autoquote.py
Autoquote2.py
CalendarWizard.py
Modified: trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/shapes/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,34 +1,34 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SHAPE_PLUGIN_MOC_CLASSES
+set(SHAPE_PLUGIN_MOC_CLASSES
shapepalette.h
shapeplugin.h
)
-SET(SHAPE_PLUGIN_SOURCES
+set(SHAPE_PLUGIN_SOURCES
shapepalette.cpp
shapeplugin.cpp
)
-SET(SCRIBUS_SHAPE_PLUGIN "shapeplugin")
+set(SCRIBUS_SHAPE_PLUGIN "shapeplugin")
QT5_WRAP_CPP(SHAPE_PLUGIN_MOC_SOURCES ${SHAPE_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SHAPE_PLUGIN} MODULE
+add_library(${SCRIBUS_SHAPE_PLUGIN} MODULE
${SHAPE_PLUGIN_SOURCES}
${SHAPE_PLUGIN_MOC_SOURCES}
)
-TARGET_LINK_LIBRARIES(${SCRIBUS_SHAPE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SHAPE_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SHAPE_PLUGIN}
+install(TARGETS ${SCRIBUS_SHAPE_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_SHAPE_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_SHAPE_PLUGIN} ${EXE_NAME})
Modified: trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/short-words/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,14 +1,14 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SHORTWORDS_PLUGIN_UI_SRC
+set(SHORTWORDS_PLUGIN_UI_SRC
swdialog.ui
prefs_shortwordsbase.ui
)
-SET(SHORTWORDS_PLUGIN_MOC_CLASSES
+set(SHORTWORDS_PLUGIN_MOC_CLASSES
configuration.h
parse.h
prefs_shortwords.h
@@ -17,7 +17,7 @@
swdialog.h
)
-SET(SHORTWORDS_PLUGIN_SOURCES
+set(SHORTWORDS_PLUGIN_SOURCES
configuration.cpp
parse.cpp
prefs_shortwords.cpp
@@ -27,29 +27,29 @@
swdialog.cpp
)
-SET(SCRIBUS_SHORTWORDS_PLUGIN "scribusshortwords")
+set(SCRIBUS_SHORTWORDS_PLUGIN "scribusshortwords")
QT5_WRAP_UI(SHORTWORDS_PLUGIN_UI_SOURCES ${SHORTWORDS_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(SHORTWORDS_PLUGIN_MOC_SOURCES ${SHORTWORDS_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SHORTWORDS_PLUGIN} MODULE
+add_library(${SCRIBUS_SHORTWORDS_PLUGIN} MODULE
${SHORTWORDS_PLUGIN_SOURCES}
${SHORTWORDS_PLUGIN_MOC_SOURCES}
${SHORTWORDS_PLUGIN_UI_SOURCES}
)
-TARGET_LINK_LIBRARIES(${SCRIBUS_SHORTWORDS_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SHORTWORDS_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SHORTWORDS_PLUGIN}
+install(TARGETS ${SCRIBUS_SHORTWORDS_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-INSTALL(FILES scribus-short-words.rc
+install(FILES scribus-short-words.rc
DESTINATION ${SHAREDIR}/plugins
)
-ADD_DEPENDENCIES(${SCRIBUS_SHORTWORDS_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_SHORTWORDS_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_FONTPREVIEW_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,8 +1,8 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIR} )
-ADD_SUBDIRECTORY (meshdistortion)
-ADD_SUBDIRECTORY (pathalongpath)
+include_directories( ${Boost_INCLUDE_DIR} )
+add_subdirectory (meshdistortion)
+add_subdirectory (pathalongpath)
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/meshdistortion/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,31 +1,31 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(MESHDISTORTION_PLUGIN_UI_SRC
+set(MESHDISTORTION_PLUGIN_UI_SRC
meshdistortiondialog.ui
)
-SET(MESHDISTORTION_PLUGIN_MOC_CLASSES
+set(MESHDISTORTION_PLUGIN_MOC_CLASSES
meshdistortiondialog.h
meshdistortion.h
)
-SET(MESHDISTORTION_PLUGIN_SOURCES
+set(MESHDISTORTION_PLUGIN_SOURCES
meshdistortiondialog.cpp
meshdistortion.cpp
)
-SET(SCRIBUS_MESHDISTORTION_PLUGIN "meshdistortion")
+set(SCRIBUS_MESHDISTORTION_PLUGIN "meshdistortion")
QT5_WRAP_UI(MESHDISTORTION_PLUGIN_UI_SOURCES ${MESHDISTORTION_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(MESHDISTORTION_PLUGIN_MOC_SOURCES ${MESHDISTORTION_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_MESHDISTORTION_PLUGIN} MODULE ${MESHDISTORTION_PLUGIN_SOURCES} ${MESHDISTORTION_PLUGIN_MOC_SOURCES} ${MESHDISTORTION_PLUGIN_UI_CPP} ${MESHDISTORTION_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_MESHDISTORTION_PLUGIN} MODULE ${MESHDISTORTION_PLUGIN_SOURCES} ${MESHDISTORTION_PLUGIN_MOC_SOURCES} ${MESHDISTORTION_PLUGIN_UI_CPP} ${MESHDISTORTION_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_MESHDISTORTION_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
-INSTALL(TARGETS ${SCRIBUS_MESHDISTORTION_PLUGIN}
+target_link_libraries(${SCRIBUS_MESHDISTORTION_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
+install(TARGETS ${SCRIBUS_MESHDISTORTION_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/2geomtools/pathalongpath/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(PATHALONGPATH_PLUGIN_UI_SRC
+set(PATHALONGPATH_PLUGIN_UI_SRC
pathdialogbase.ui
)
-SET(PATHALONGPATH_PLUGIN_MOC_CLASSES
+set(PATHALONGPATH_PLUGIN_MOC_CLASSES
pathdialog.h
pathalongpath.h
)
-SET(PATHALONGPATH_PLUGIN_SOURCES
+set(PATHALONGPATH_PLUGIN_SOURCES
pathdialog.cpp
pathalongpath.cpp
)
-SET(SCRIBUS_PATHALONGPATH_PLUGIN "pathalongpath")
+set(SCRIBUS_PATHALONGPATH_PLUGIN "pathalongpath")
QT5_WRAP_UI(PATHALONGPATH_PLUGIN_UI_SOURCES ${PATHALONGPATH_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(PATHALONGPATH_PLUGIN_MOC_SOURCES ${PATHALONGPATH_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_PATHALONGPATH_PLUGIN} MODULE ${PATHALONGPATH_PLUGIN_SOURCES} ${PATHALONGPATH_PLUGIN_MOC_SOURCES} ${PATHALONGPATH_PLUGIN_UI_CPP} ${PATHALONGPATH_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PATHALONGPATH_PLUGIN} MODULE ${PATHALONGPATH_PLUGIN_SOURCES} ${PATHALONGPATH_PLUGIN_MOC_SOURCES} ${PATHALONGPATH_PLUGIN_UI_CPP} ${PATHALONGPATH_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PATHALONGPATH_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
+target_link_libraries(${SCRIBUS_PATHALONGPATH_PLUGIN} ${PLUGIN_LIBRARIES} ${SCRIBUS_2GEOM_LIB})
-INSTALL(TARGETS ${SCRIBUS_PATHALONGPATH_PLUGIN}
+install(TARGETS ${SCRIBUS_PATHALONGPATH_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,15 +1,15 @@
#Subdirectories
-IF(HAVE_BOOST)
- ADD_SUBDIRECTORY(2geomtools)
-ENDIF()
-ADD_SUBDIRECTORY(lenseffects)
-ADD_SUBDIRECTORY(pathconnect)
-ADD_SUBDIRECTORY(pathcut)
-ADD_SUBDIRECTORY(pathfinder)
-ADD_SUBDIRECTORY(pathstroker)
-ADD_SUBDIRECTORY(subdivide)
-ADD_SUBDIRECTORY(flattenpath)
-ADD_SUBDIRECTORY(smoothpath)
+if(HAVE_BOOST)
+ add_subdirectory(2geomtools)
+endif()
+add_subdirectory(lenseffects)
+add_subdirectory(pathconnect)
+add_subdirectory(pathcut)
+add_subdirectory(pathfinder)
+add_subdirectory(pathstroker)
+add_subdirectory(subdivide)
+add_subdirectory(flattenpath)
+add_subdirectory(smoothpath)
if (HAVE_HUNSPELL)
- ADD_SUBDIRECTORY(hunspellcheck)
+ add_subdirectory(hunspellcheck)
endif (HAVE_HUNSPELL)
Modified: trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/flattenpath/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,25 +1,25 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(FLATTENPATH_PLUGIN_MOC_CLASSES
+set(FLATTENPATH_PLUGIN_MOC_CLASSES
flattenpath.h
)
-SET(FLATTENPATH_PLUGIN_SOURCES
+set(FLATTENPATH_PLUGIN_SOURCES
flattenpath.cpp
)
-SET(SCRIBUS_FLATTENPATH_PLUGIN "flattenpath")
+set(SCRIBUS_FLATTENPATH_PLUGIN "flattenpath")
QT5_WRAP_CPP(FLATTENPATH_PLUGIN_MOC_SOURCES ${FLATTENPATH_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_FLATTENPATH_PLUGIN} MODULE ${FLATTENPATH_PLUGIN_SOURCES} ${FLATTENPATH_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_FLATTENPATH_PLUGIN} MODULE ${FLATTENPATH_PLUGIN_SOURCES} ${FLATTENPATH_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_FLATTENPATH_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_FLATTENPATH_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_FLATTENPATH_PLUGIN}
+install(TARGETS ${SCRIBUS_FLATTENPATH_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/hunspellcheck/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,47 +1,47 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${HUNSPELL_INCLUDE_DIR}
)
-SET(HUNSPELL_PLUGIN_UI_SRC
+set(HUNSPELL_PLUGIN_UI_SRC
hunspelldialogbase.ui
)
-SET(HUNSPELL_PLUGIN_MOC_CLASSES
+set(HUNSPELL_PLUGIN_MOC_CLASSES
hunspelldialog.h
hunspellplugin.h
hunspellpluginimpl.h
)
-SET(HUNSPELL_PLUGIN_SOURCES
+set(HUNSPELL_PLUGIN_SOURCES
hunspelldialog.cpp
hunspelldict.cpp
hunspellplugin.cpp
hunspellpluginimpl.cpp
)
-SET(SCRIBUS_HUNSPELL_PLUGIN "hunspellplugin")
+set(SCRIBUS_HUNSPELL_PLUGIN "hunspellplugin")
QT5_WRAP_UI(HUNSPELL_PLUGIN_UI_SOURCES ${HUNSPELL_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(HUNSPELL_PLUGIN_MOC_SOURCES ${HUNSPELL_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_HUNSPELL_PLUGIN} MODULE
+add_library(${SCRIBUS_HUNSPELL_PLUGIN} MODULE
${HUNSPELL_PLUGIN_SOURCES}
${HUNSPELL_PLUGIN_MOC_SOURCES}
${HUNSPELL_PLUGIN_UI_SOURCES}
)
-TARGET_LINK_LIBRARIES(${SCRIBUS_HUNSPELL_PLUGIN} ${HUNSPELL_LIBRARIES} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_HUNSPELL_PLUGIN} ${HUNSPELL_LIBRARIES} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_HUNSPELL_PLUGIN}
+install(TARGETS ${SCRIBUS_HUNSPELL_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-ADD_DEPENDENCIES(${SCRIBUS_HUNSPELL_PLUGIN} ${EXE_NAME})
+add_dependencies(${SCRIBUS_HUNSPELL_PLUGIN} ${EXE_NAME})
-# SET_TARGET_PROPERTIES(${SCRIBUS_ASPELL_PLUGIN} PROPERTIES VERSION "0.0.1")
+# set_target_properties(${SCRIBUS_ASPELL_PLUGIN} PROPERTIES VERSION "0.0.1")
Modified: trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/lenseffects/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,35 +1,35 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(LENSEFFECTS_PLUGIN_UI_SRC
+set(LENSEFFECTS_PLUGIN_UI_SRC
lensdialogbase.ui
)
-SET(LENSEFFECTS_PLUGIN_MOC_CLASSES
+set(LENSEFFECTS_PLUGIN_MOC_CLASSES
lensdialog.h
lenseffects.h
)
-SET(LENSEFFECTS_PLUGIN_SOURCES
+set(LENSEFFECTS_PLUGIN_SOURCES
lensdialog.cpp
lenseffects.cpp
)
-SET(SCRIBUS_LENSEFFECTS_PLUGIN "lenseffects")
+set(SCRIBUS_LENSEFFECTS_PLUGIN "lenseffects")
QT5_WRAP_UI(LENSEFFECTS_PLUGIN_UI_SOURCES ${LENSEFFECTS_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(LENSEFFECTS_PLUGIN_MOC_SOURCES ${LENSEFFECTS_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_LENSEFFECTS_PLUGIN} MODULE ${LENSEFFECTS_PLUGIN_SOURCES} ${LENSEFFECTS_PLUGIN_MOC_SOURCES} ${LENSEFFECTS_PLUGIN_UI_CPP} ${LENSEFFECTS_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_LENSEFFECTS_PLUGIN} MODULE ${LENSEFFECTS_PLUGIN_SOURCES} ${LENSEFFECTS_PLUGIN_MOC_SOURCES} ${LENSEFFECTS_PLUGIN_UI_CPP} ${LENSEFFECTS_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_LENSEFFECTS_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_LENSEFFECTS_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_LENSEFFECTS_PLUGIN}
+install(TARGETS ${SCRIBUS_LENSEFFECTS_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathconnect/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(PATHCONNECT_PLUGIN_UI_SRC
+set(PATHCONNECT_PLUGIN_UI_SRC
pathconnectdialogbase.ui
)
-SET(PATHCONNECT_PLUGIN_MOC_CLASSES
+set(PATHCONNECT_PLUGIN_MOC_CLASSES
pathconnectdialog.h
pathconnect.h
)
-SET(PATHCONNECT_PLUGIN_SOURCES
+set(PATHCONNECT_PLUGIN_SOURCES
pathconnectdialog.cpp
pathconnect.cpp
)
-SET(SCRIBUS_PATHCONNECT_PLUGIN "pathconnect")
+set(SCRIBUS_PATHCONNECT_PLUGIN "pathconnect")
QT5_WRAP_UI(PATHCONNECT_PLUGIN_UI_SOURCES ${PATHCONNECT_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(PATHCONNECT_PLUGIN_MOC_SOURCES ${PATHCONNECT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_PATHCONNECT_PLUGIN} MODULE ${PATHCONNECT_PLUGIN_SOURCES} ${PATHCONNECT_PLUGIN_MOC_SOURCES} ${PATHCONNECT_PLUGIN_UI_CPP} ${PATHCONNECT_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PATHCONNECT_PLUGIN} MODULE ${PATHCONNECT_PLUGIN_SOURCES} ${PATHCONNECT_PLUGIN_MOC_SOURCES} ${PATHCONNECT_PLUGIN_UI_CPP} ${PATHCONNECT_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PATHCONNECT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHCONNECT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_PATHCONNECT_PLUGIN}
+install(TARGETS ${SCRIBUS_PATHCONNECT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathcut/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,30 +1,30 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-INSTALL(FILES
+install(FILES
transform-crop-and-resize.png
DESTINATION ${ICONDIR}
)
-SET(PATHCUT_PLUGIN_MOC_CLASSES
+set(PATHCUT_PLUGIN_MOC_CLASSES
pathcut.h
)
-SET(PATHCUT_PLUGIN_SOURCES
+set(PATHCUT_PLUGIN_SOURCES
pathcut.cpp
)
-SET(SCRIBUS_PATHCUT_PLUGIN "pathcut")
+set(SCRIBUS_PATHCUT_PLUGIN "pathcut")
QT5_WRAP_CPP(PATHCUT_PLUGIN_MOC_SOURCES ${PATHCUT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_PATHCUT_PLUGIN} MODULE ${PATHCUT_PLUGIN_SOURCES} ${PATHCUT_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_PATHCUT_PLUGIN} MODULE ${PATHCUT_PLUGIN_SOURCES} ${PATHCUT_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PATHCUT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHCUT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_PATHCUT_PLUGIN}
+install(TARGETS ${SCRIBUS_PATHCUT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathfinder/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-INSTALL(FILES
+install(FILES
pathexclusion.png
pathintersection.png
pathparts.png
@@ -12,30 +12,30 @@
DESTINATION ${ICONDIR}
)
-SET(PATHFINDER_PLUGIN_UI_SRC
+set(PATHFINDER_PLUGIN_UI_SRC
pathfinderbase.ui
)
-SET(PATHFINDER_PLUGIN_MOC_CLASSES
+set(PATHFINDER_PLUGIN_MOC_CLASSES
pathfinder.h
pathfinderdialog.h
)
-SET(PATHFINDER_PLUGIN_SOURCES
+set(PATHFINDER_PLUGIN_SOURCES
pathfinder.cpp
pathfinderdialog.cpp
)
-SET(SCRIBUS_PATHFINDER_PLUGIN "pathfinder")
+set(SCRIBUS_PATHFINDER_PLUGIN "pathfinder")
QT5_WRAP_UI(PATHFINDER_PLUGIN_UI_SOURCES ${PATHFINDER_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(PATHFINDER_PLUGIN_MOC_SOURCES ${PATHFINDER_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_PATHFINDER_PLUGIN} MODULE ${PATHFINDER_PLUGIN_SOURCES} ${PATHFINDER_PLUGIN_MOC_SOURCES} ${PATHFINDER_PLUGIN_UI_CPP} ${PATHFINDER_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_PATHFINDER_PLUGIN} MODULE ${PATHFINDER_PLUGIN_SOURCES} ${PATHFINDER_PLUGIN_MOC_SOURCES} ${PATHFINDER_PLUGIN_UI_CPP} ${PATHFINDER_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PATHFINDER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHFINDER_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_PATHFINDER_PLUGIN}
+install(TARGETS ${SCRIBUS_PATHFINDER_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/pathstroker/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,25 +1,25 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(PATHSTROKER_PLUGIN_MOC_CLASSES
+set(PATHSTROKER_PLUGIN_MOC_CLASSES
pathstroker.h
)
-SET(PATHSTROKER_PLUGIN_SOURCES
+set(PATHSTROKER_PLUGIN_SOURCES
pathstroker.cpp
)
-SET(SCRIBUS_PATHSTROKER_PLUGIN "pathstroker")
+set(SCRIBUS_PATHSTROKER_PLUGIN "pathstroker")
QT5_WRAP_CPP(PATHSTROKER_PLUGIN_MOC_SOURCES ${PATHSTROKER_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_PATHSTROKER_PLUGIN} MODULE ${PATHSTROKER_PLUGIN_SOURCES} ${PATHSTROKER_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_PATHSTROKER_PLUGIN} MODULE ${PATHSTROKER_PLUGIN_SOURCES} ${PATHSTROKER_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_PATHSTROKER_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_PATHSTROKER_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_PATHSTROKER_PLUGIN}
+install(TARGETS ${SCRIBUS_PATHSTROKER_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/smoothpath/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,25 +1,25 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SMOOTHPATH_PLUGIN_MOC_CLASSES
+set(SMOOTHPATH_PLUGIN_MOC_CLASSES
smoothpath.h
)
-SET(SMOOTHPATH_PLUGIN_SOURCES
+set(SMOOTHPATH_PLUGIN_SOURCES
smoothpath.cpp
)
-SET(SCRIBUS_SMOOTHPATH_PLUGIN "smoothpath")
+set(SCRIBUS_SMOOTHPATH_PLUGIN "smoothpath")
QT5_WRAP_CPP(SMOOTHPATH_PLUGIN_MOC_SOURCES ${SMOOTHPATH_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SMOOTHPATH_PLUGIN} MODULE ${SMOOTHPATH_PLUGIN_SOURCES} ${SMOOTHPATH_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SMOOTHPATH_PLUGIN} MODULE ${SMOOTHPATH_PLUGIN_SOURCES} ${SMOOTHPATH_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SMOOTHPATH_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SMOOTHPATH_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SMOOTHPATH_PLUGIN}
+install(TARGETS ${SCRIBUS_SMOOTHPATH_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/subdivide/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,28 +1,28 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(SUBDIVIDE_PLUGIN_MOC_CLASSES
+set(SUBDIVIDE_PLUGIN_MOC_CLASSES
subdivide.h
)
-SET(SUBDIVIDE_PLUGIN_SOURCES
+set(SUBDIVIDE_PLUGIN_SOURCES
subdivide.cpp
)
-SET(SCRIBUS_SUBDIVIDE_PLUGIN "subdivide")
+set(SCRIBUS_SUBDIVIDE_PLUGIN "subdivide")
QT5_WRAP_CPP(SUBDIVIDE_PLUGIN_MOC_SOURCES ${SUBDIVIDE_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_SUBDIVIDE_PLUGIN} MODULE ${SUBDIVIDE_PLUGIN_SOURCES} ${SUBDIVIDE_PLUGIN_MOC_SOURCES})
+add_library(${SCRIBUS_SUBDIVIDE_PLUGIN} MODULE ${SUBDIVIDE_PLUGIN_SOURCES} ${SUBDIVIDE_PLUGIN_MOC_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_SUBDIVIDE_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_SUBDIVIDE_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_SUBDIVIDE_PLUGIN}
+install(TARGETS ${SCRIBUS_SUBDIVIDE_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
)
-# SET_TARGET_PROPERTIES(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")
+# set_target_properties(${SCRIBUS_COLORWHEEL_PLUGIN} PROPERTIES VERSION "0.0.0")
Modified: trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/plugins/tools/transform/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,32 +1,32 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(TRANSFORMEFFECT_PLUGIN_UI_SRC
+set(TRANSFORMEFFECT_PLUGIN_UI_SRC
transformdialogbase.ui
)
-SET(TRANSFORMEFFECT_PLUGIN_MOC_CLASSES
+set(TRANSFORMEFFECT_PLUGIN_MOC_CLASSES
transformdialog.h
transformeffect.h
)
-SET(TRANSFORMEFFECT_PLUGIN_SOURCES
+set(TRANSFORMEFFECT_PLUGIN_SOURCES
transformdialog.cpp
transformeffect.cpp
)
-SET(SCRIBUS_TRANSFORMEFFECT_PLUGIN "transformeffect")
+set(SCRIBUS_TRANSFORMEFFECT_PLUGIN "transformeffect")
QT5_WRAP_UI(TRANSFORMEFFECT_PLUGIN_UI_SOURCES ${TRANSFORMEFFECT_PLUGIN_UI_SRC} )
QT5_WRAP_CPP(TRANSFORMEFFECT_PLUGIN_MOC_SOURCES ${TRANSFORMEFFECT_PLUGIN_MOC_CLASSES})
-ADD_LIBRARY(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} MODULE ${TRANSFORMEFFECT_PLUGIN_SOURCES} ${TRANSFORMEFFECT_PLUGIN_MOC_SOURCES} ${TRANSFORMEFFECT_PLUGIN_UI_CPP} ${TRANSFORMEFFECT_PLUGIN_UI_SOURCES})
+add_library(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} MODULE ${TRANSFORMEFFECT_PLUGIN_SOURCES} ${TRANSFORMEFFECT_PLUGIN_MOC_SOURCES} ${TRANSFORMEFFECT_PLUGIN_UI_CPP} ${TRANSFORMEFFECT_PLUGIN_UI_SOURCES})
-TARGET_LINK_LIBRARIES(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} ${PLUGIN_LIBRARIES})
+target_link_libraries(${SCRIBUS_TRANSFORMEFFECT_PLUGIN} ${PLUGIN_LIBRARIES})
-INSTALL(TARGETS ${SCRIBUS_TRANSFORMEFFECT_PLUGIN}
+install(TARGETS ${SCRIBUS_TRANSFORMEFFECT_PLUGIN}
LIBRARY
DESTINATION ${PLUGINDIR}
PERMISSIONS ${PLUGIN_PERMISSIONS}
Modified: trunk/Scribus/scribus/relaxng/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/relaxng/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/relaxng/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/relaxng/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,23 +1,23 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
)
-INCLUDE("generatedfiles.cmake")
+include("generatedfiles.cmake")
-# IF(QT4_WRAP_CPP)
+# if(QT4_WRAP_CPP)
QT4_WRAP_CPP(SCRIBUS_RELAXNG_MOC_SOURCES ${SCRIBUS_RELAXNG_HEADERS})
-# ENDIF()
+# endif()
-SET(SCRIBUS_RELAXNG_LIB "scribus_relaxng_lib")
-ADD_LIBRARY(${SCRIBUS_RELAXNG_LIB} STATIC ${SCRIBUS_RELAXNG_SOURCES} ${SCRIBUS_RELAXNG_MOC_SOURCES})
+set(SCRIBUS_RELAXNG_LIB "scribus_relaxng_lib")
+add_library(${SCRIBUS_RELAXNG_LIB} STATIC ${SCRIBUS_RELAXNG_SOURCES} ${SCRIBUS_RELAXNG_MOC_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_RELAXNG_LIB}
+set_target_properties(${SCRIBUS_RELAXNG_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/styles/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/styles/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/styles/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/styles/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,15 +1,15 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(SCRIBUS_STYLES_MOC_CLASSES
+set(SCRIBUS_STYLES_MOC_CLASSES
)
-SET(SCRIBUS_STYLES_LIB_SOURCES
+set(SCRIBUS_STYLES_LIB_SOURCES
style.cpp
stylecontext.cpp
stylecontextproxy.cpp
@@ -22,12 +22,12 @@
QT5_WRAP_CPP(SCRIBUS_STYLES_MOC_SOURCES ${SCRIBUS_STYLES_MOC_CLASSES})
-SET(SCRIBUS_STYLES_LIB "scribus_styles_lib")
-ADD_LIBRARY(${SCRIBUS_STYLES_LIB} STATIC ${SCRIBUS_STYLES_LIB_SOURCES} ${SCRIBUS_STYLES_MOC_SOURCES})
+set(SCRIBUS_STYLES_LIB "scribus_styles_lib")
+add_library(${SCRIBUS_STYLES_LIB} STATIC ${SCRIBUS_STYLES_LIB_SOURCES} ${SCRIBUS_STYLES_MOC_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_STYLES_LIB}
+set_target_properties(${SCRIBUS_STYLES_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/tests/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/tests/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/tests/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/tests/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,4 +1,4 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
@@ -6,12 +6,12 @@
)
-SET(SCRIBUS_TEST_MOC_CLASSES
+set(SCRIBUS_TEST_MOC_CLASSES
#testIndex.h
testStoryText.h
)
-SET(SCRIBUS_TEST_SOURCES
+set(SCRIBUS_TEST_SOURCES
runtests.cpp
#testIndex.cpp
testStoryText.cpp
@@ -19,13 +19,13 @@
QT5_WRAP_CPP(SCRIBUS_TEST_MOC_SOURCES ${SCRIBUS_TEST_MOC_CLASSES})
-SET(SCRIBUS_TESTS_LIB "scribus_tests_lib")
-ADD_LIBRARY(${SCRIBUS_TESTS_LIB} STATIC ${SCRIBUS_TEST_SOURCES} ${SCRIBUS_TEST_MOC_SOURCES})
+set(SCRIBUS_TESTS_LIB "scribus_tests_lib")
+add_library(${SCRIBUS_TESTS_LIB} STATIC ${SCRIBUS_TEST_SOURCES} ${SCRIBUS_TEST_MOC_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_TESTS_LIB}
+set_target_properties(${SCRIBUS_TESTS_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
@@ -36,13 +36,13 @@
# These tests are built as standalone executables and runned using "make test"
#
-SET(TESTS_LIBRARIES ${QT_QTTEST_LIBRARY} ${QT_LIBRARIES})
+set(TESTS_LIBRARIES ${QT_QTTEST_LIBRARY} ${QT_LIBRARIES})
# Unit tests for CellArea
-SET(CELLAREATESTS_CLASSES cellareatests.h)
-SET(CELLAREATESTS_SOURCES cellareatests.cpp ../cellarea.cpp)
+set(CELLAREATESTS_CLASSES cellareatests.h)
+set(CELLAREATESTS_SOURCES cellareatests.cpp ../cellarea.cpp)
QT5_WRAP_CPP(CELLAREATESTS_SOURCES ${CELLAREATESTS_CLASSES})
-ADD_EXECUTABLE(cellareatests ${CELLAREATESTS_SOURCES})
-TARGET_LINK_LIBRARIES(cellareatests ${TESTS_LIBRARIES})
-ADD_TEST(NAME cellareatests COMMAND cellareatests)
+add_executable(cellareatests ${CELLAREATESTS_SOURCES})
+target_link_libraries(cellareatests ${TESTS_LIBRARIES})
+add_test(NAME cellareatests COMMAND cellareatests)
Modified: trunk/Scribus/scribus/text/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/text/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/text/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/text/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,18 +1,18 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${FREETYPE_INCLUDE_DIRS}
${CAIRO_INCLUDE_DIRS}
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(SCRIBUS_TEXT_MOC_CLASSES
+set(SCRIBUS_TEXT_MOC_CLASSES
storytext.h
boxes.h
)
-SET(SCRIBUS_TEXT_LIB_SOURCES
+set(SCRIBUS_TEXT_LIB_SOURCES
boxes.cpp
frect.cpp
fsize.cpp
@@ -27,11 +27,11 @@
QT5_WRAP_CPP(SCRIBUS_TEXT_MOC_SOURCES ${SCRIBUS_TEXT_MOC_CLASSES})
-SET(SCRIBUS_TEXT_LIB "scribus_text_lib")
-ADD_LIBRARY(${SCRIBUS_TEXT_LIB} STATIC ${SCRIBUS_TEXT_LIB_SOURCES} ${SCRIBUS_TEXT_MOC_SOURCES})
+set(SCRIBUS_TEXT_LIB "scribus_text_lib")
+add_library(${SCRIBUS_TEXT_LIB} STATIC ${SCRIBUS_TEXT_LIB_SOURCES} ${SCRIBUS_TEXT_MOC_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_TEXT_LIB}
+set_target_properties(${SCRIBUS_TEXT_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/third_party/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/third_party/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,12 +1,12 @@
-IF(HAVE_OSG)
- ADD_SUBDIRECTORY(prc)
-ENDIF ()
+if(HAVE_OSG)
+ add_subdirectory(prc)
+endif ()
-IF(HAVE_BOOST)
- ADD_SUBDIRECTORY(lib2geom)
-ENDIF()
+if(HAVE_BOOST)
+ add_subdirectory(lib2geom)
+endif()
-ADD_SUBDIRECTORY(wpg)
-ADD_SUBDIRECTORY(pgf)
-ADD_SUBDIRECTORY(rtf-qt)
-ADD_SUBDIRECTORY(zip)
+add_subdirectory(wpg)
+add_subdirectory(pgf)
+add_subdirectory(rtf-qt)
+add_subdirectory(zip)
Modified: trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/lib2geom/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,18 +1,18 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(2GEOM_VERSION 0.1.0)
+set(2GEOM_VERSION 0.1.0)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-OPTION(2GEOM_BUILD_SHARED
+option(2GEOM_BUILD_SHARED
"Build lib2geom and libtoy as shared libraries."
OFF)
-SET(LIB_TYPE STATIC)
+set(LIB_TYPE STATIC)
-SET(2GEOM_SRC
+set(2GEOM_SRC
svg-path.h
svg-path.cpp
ord.h
@@ -88,12 +88,12 @@
scribushelper.cpp
)
-SET(SCRIBUS_2GEOM_LIB "scribus_2geom_lib")
-ADD_LIBRARY(${SCRIBUS_2GEOM_LIB} STATIC ${2GEOM_SRC})
+set(SCRIBUS_2GEOM_LIB "scribus_2geom_lib")
+add_library(${SCRIBUS_2GEOM_LIB} STATIC ${2GEOM_SRC})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_2GEOM_LIB}
+set_target_properties(${SCRIBUS_2GEOM_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/pgf/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,11 +1,11 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(SCRIBUS_PGF_LIB_SOURCES
+set(SCRIBUS_PGF_LIB_SOURCES
Decoder.cpp
Encoder.cpp
PGFimage.cpp
@@ -15,9 +15,9 @@
)
-SET(SCRIBUS_PGF_LIB "scribus_pgf_lib")
-ADD_LIBRARY(${SCRIBUS_PGF_LIB} STATIC ${SCRIBUS_PGF_LIB_SOURCES})
-SET_TARGET_PROPERTIES(${SCRIBUS_PGF_LIB}
+set(SCRIBUS_PGF_LIB "scribus_pgf_lib")
+add_library(${SCRIBUS_PGF_LIB} STATIC ${SCRIBUS_PGF_LIB_SOURCES})
+set_target_properties(${SCRIBUS_PGF_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/third_party/prc/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/third_party/prc/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/prc/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/prc/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,11 +1,11 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${OPENGL_INCLUDE_DIR}
${FREETYPE_INCLUDE_DIRS}
)
-SET(SCRIBUS_PRC_LIB_SOURCES
+set(SCRIBUS_PRC_LIB_SOURCES
oPRCFile.cc
PRCbitStream.cc
PRCdouble.cc
@@ -13,12 +13,12 @@
exportPRC.cpp
)
-SET(SCRIBUS_PRC_LIB "scribus_prc_lib")
-ADD_LIBRARY(${SCRIBUS_PRC_LIB} STATIC ${SCRIBUS_PRC_LIB_SOURCES})
+set(SCRIBUS_PRC_LIB "scribus_prc_lib")
+add_library(${SCRIBUS_PRC_LIB} STATIC ${SCRIBUS_PRC_LIB_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_PRC_LIB}
+set_target_properties(${SCRIBUS_PRC_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/rtf-qt/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,11 +1,11 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(SCRIBUS_RTF_LIB_SOURCES
+set(SCRIBUS_RTF_LIB_SOURCES
AbstractRtfOutput.cpp
AuthorPcdataDestination.cpp
CategoryPcdataDestination.cpp
@@ -40,16 +40,16 @@
UserPropsDestination.cpp
)
-SET(SCRIBUS_RTF_LIB_MOC_CLASSES
+set(SCRIBUS_RTF_LIB_MOC_CLASSES
rtfreader.h
)
QT5_WRAP_CPP(SCRIBUS_RTF_LIB_MOC_SOURCES ${SCRIBUS_RTF_LIB_MOC_CLASSES})
-SET(SCRIBUS_RTF_LIB "scribus_rtf_lib")
-ADD_LIBRARY(${SCRIBUS_RTF_LIB} STATIC ${SCRIBUS_RTF_LIB_SOURCES} ${SCRIBUS_RTF_LIB_MOC_SOURCES})
-SET_TARGET_PROPERTIES(${SCRIBUS_ZIB_LIB}
+set(SCRIBUS_RTF_LIB "scribus_rtf_lib")
+add_library(${SCRIBUS_RTF_LIB} STATIC ${SCRIBUS_RTF_LIB_SOURCES} ${SCRIBUS_RTF_LIB_MOC_SOURCES})
+set_target_properties(${SCRIBUS_ZIB_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/wpg/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,13 +1,13 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(LIB_TYPE STATIC)
+set(LIB_TYPE STATIC)
-SET(WPG_SOURCES
+set(WPG_SOURCES
WPG1Parser.cpp
WPG2Parser.cpp
WPGBinaryData.cpp
@@ -28,12 +28,12 @@
WPGXParser.cpp
)
-SET(SCRIBUS_WPG_LIB "scribus_wpg_lib")
-ADD_LIBRARY(${SCRIBUS_WPG_LIB} STATIC ${WPG_SOURCES})
+set(SCRIBUS_WPG_LIB "scribus_wpg_lib")
+add_library(${SCRIBUS_WPG_LIB} STATIC ${WPG_SOURCES})
# This is a convenience library that for linkage purposes is part of Scribus's
# main API.
-SET_TARGET_PROPERTIES(${SCRIBUS_WPG_LIB}
+set_target_properties(${SCRIBUS_WPG_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/third_party/zip/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/third_party/zip/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/third_party/zip/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,19 +1,19 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
${ZLIB_INCLUDE_DIR}
)
-SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_FPIC}")
-SET(SCRIBUS_ZIP_LIB_SOURCES
+set(SCRIBUS_ZIP_LIB_SOURCES
unzip.cpp
zip.cpp
zipglobal.cpp
scribus_zip.cpp
)
-SET(SCRIBUS_ZIP_LIB_MOC_CLASSES
+set(SCRIBUS_ZIP_LIB_MOC_CLASSES
zip_p.h
unzip_p.h
)
@@ -21,9 +21,9 @@
QT5_WRAP_CPP(SCRIBUS_ZIP_LIB_MOC_SOURCES ${SCRIBUS_ZIP_LIB_MOC_CLASSES})
-SET(SCRIBUS_ZIB_LIB "scribus_zip_lib")
-ADD_LIBRARY(${SCRIBUS_ZIB_LIB} STATIC ${SCRIBUS_ZIP_LIB_SOURCES} ${SCRIBUS_ZIP_LIB_MOC_SOURCES})
-SET_TARGET_PROPERTIES(${SCRIBUS_ZIB_LIB}
+set(SCRIBUS_ZIB_LIB "scribus_zip_lib")
+add_library(${SCRIBUS_ZIB_LIB} STATIC ${SCRIBUS_ZIP_LIB_SOURCES} ${SCRIBUS_ZIP_LIB_MOC_SOURCES})
+set_target_properties(${SCRIBUS_ZIB_LIB}
PROPERTIES
COMPILE_FLAGS -DCOMPILE_SCRIBUS_MAIN_APP
)
Modified: trunk/Scribus/scribus/ui/qml/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/ui/qml/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/ui/qml/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/ui/qml/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,6 +1,6 @@
-FILE(GLOB QML_FILES *.qml)
+file(GLOB QML_FILES *.qml)
-INSTALL(FILES ${QML_FILES}
+install(FILES ${QML_FILES}
DESTINATION ${QMLDIR}
)
Modified: trunk/Scribus/scribus/unicodemap/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=21543&path=/trunk/Scribus/scribus/unicodemap/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/unicodemap/CMakeLists.txt (original)
+++ trunk/Scribus/scribus/unicodemap/CMakeLists.txt Sun Nov 27 21:37:34 2016
@@ -1,9 +1,9 @@
-INCLUDE_DIRECTORIES(
+include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/scribus
)
-INSTALL(FILES
+install(FILES
unicodenameslist.txt
DESTINATION ${SHAREDIR}
)
More information about the scribus-commit
mailing list