r23014 by craig - Update CMakeLists for syntax

scribus-commit scribus-commit at lists.scribus.net
Mon Jun 10 15:20:42 UTC 2019


Author: craig
Date: Mon Jun 10 15:20:41 2019
New Revision: 23014

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23014
Log:
Update CMakeLists for syntax

Modified:
    trunk/Scribus/cmake/modules/CAIROConfig.cmake
    trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake
    trunk/Scribus/cmake/modules/FREETYPEConfig.cmake
    trunk/Scribus/cmake/modules/FindHUNSPELL.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

Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/CAIROConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/CAIROConfig.cmake	(original)
+++ trunk/Scribus/cmake/modules/CAIROConfig.cmake	Mon Jun 10 15:20:41 2019
@@ -54,7 +54,7 @@
 # 	endif(PREFIX_CAIRO)
 # endif(NOT PREFIX_CAIRO)
 
-set(CAIRO_FIND_QUIETLY 1)
+set(CAIRO_FIND_QUIETLY ON)
 
 if (CAIRO_LIBRARY)
   if (CAIRO_INCLUDE_DIR)

Modified: trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake	(original)
+++ trunk/Scribus/cmake/modules/FONTCONFIGConfig.cmake	Mon Jun 10 15:20:41 2019
@@ -10,12 +10,12 @@
 # LIBFONTCONFIG_CFLAGS, cflags for include information
 
 if (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
-  include(UsePkgConfig)
-  PKGCONFIG(fontconfig _fontconfigIncDir _fontconfigLinkDir _fontconfigLinkFlags _fontconfigCflags)
-  set(FONTCONFIG_LIBS ${_fontconfigCflags})
+	include(UsePkgConfig)
+	PKGCONFIG(fontconfig _fontconfigIncDir _fontconfigLinkDir _fontconfigLinkFlags _fontconfigCflags)
+	set(FONTCONFIG_LIBS ${_fontconfigCflags})
 else (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
-  include(FindPkgConfig)
-  pkg_search_module(FONTCONFIG REQUIRED fontconfig)
+	include(FindPkgConfig)
+	pkg_search_module(FONTCONFIG REQUIRED fontconfig)
 endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
 
 #include(UsePkgConfig)
@@ -27,30 +27,30 @@
 #set(FONTCONFIG_LIBS ${_fontconfigCflags})
 
 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 
-    NAMES fontconfig
-    PATHS ${FONTCONFIG_LIBRARY_DIRS} /opt/local/lib
-    NO_DEFAULT_PATH
-  )
+	find_path(FONTCONFIG_INCLUDE_DIR
+		NAMES fontconfig/fontconfig.h
+		PATHS ${FONTCONFIG_INCLUDE_DIRS} /opt/local/include
+		NO_DEFAULT_PATH
+		)
+	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 
-    NAMES fontconfig/fontconfig.h
-	PATHS ${FONTCONFIG_INCLUDE_DIRS} 
-    ${_fontconfigIncDir}
-    /usr/include
-    /usr/local/include
-    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
-    PATHS ${FONTCONFIG_LIBRARY_DIRS} /usr/lib /usr/local/lib
-  )
+	find_path(FONTCONFIG_INCLUDE_DIR
+		NAMES fontconfig/fontconfig.h
+		PATHS ${FONTCONFIG_INCLUDE_DIRS}
+		${_fontconfigIncDir}
+		/usr/include
+		/usr/local/include
+		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
+		PATHS ${FONTCONFIG_LIBRARY_DIRS} /usr/lib /usr/local/lib
+		)
 endif(BUILD_OSX_BUNDLE)
 
 
@@ -59,13 +59,13 @@
 
 
 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)
+	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=23014&path=/trunk/Scribus/cmake/modules/FREETYPEConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FREETYPEConfig.cmake	(original)
+++ trunk/Scribus/cmake/modules/FREETYPEConfig.cmake	Mon Jun 10 15:20:41 2019
@@ -11,49 +11,49 @@
 # FREETYPE_LIBRARY, where to find the FREETYPE library.
 
 if (BUILD_OSX_BUNDLE)
-  find_path(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
-    /opt/local/include/
-    NO_CMAKE_SYSTEM_PATH
-  )
+	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
-    /usr/include/
-    /usr/local/include/
-    NO_CMAKE_SYSTEM_PATH
-  )
+	find_path(FREETYPE_INCLUDE_DIR_FT2BUILD ft2build.h
+		/usr/include/
+		/usr/local/include/
+		NO_CMAKE_SYSTEM_PATH
+		)
 endif (BUILD_OSX_BUNDLE)
 
 
 if (BUILD_OSX_BUNDLE)
-  find_path(FREETYPE_INCLUDE_DIR_FTHEADER freetype/config/ftheader.h
-    /opt/local/include/freetype2
-    NO_CMAKE_SYSTEM_PATH
-  )
+	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
-    /usr/include/freetype2
-    /usr/local/include/freetype2
-    NO_CMAKE_SYSTEM_PATH
-  )
+	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)
 
 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)
+	set(FREETYPE_LIB_PATHS /opt/local/lib)
 else(BUILD_OSX_BUNDLE)
-  set(FREETYPE_LIB_PATHS /usr/lib /usr/local/lib)
+	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}
-  PATHS
-  ${FREETYPE_LIB_PATHS}
-  NO_CMAKE_SYSTEM_PATH)
+	PATHS
+	${FREETYPE_LIB_PATHS}
+	NO_CMAKE_SYSTEM_PATH)
 find_library(FREETYPE_LIBRARY_DEBUG ${FREETYPE_LIBRARY_NAMES_DEBUG}
-  PATHS
-  ${FREETYPE_LIB_PATHS}
-  NO_CMAKE_SYSTEM_PATH)
+	PATHS
+	${FREETYPE_LIB_PATHS}
+	NO_CMAKE_SYSTEM_PATH)
 
 include(LibraryDebugAndRelease)
 SET_LIBRARY_FROM_DEBUG_AND_RELEASE(FREETYPE)
@@ -62,20 +62,20 @@
 # 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 ON)
 
 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)
+	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)

Modified: trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindHUNSPELL.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindHUNSPELL.cmake	Mon Jun 10 15:20:41 2019
@@ -27,7 +27,7 @@
 string(REGEX MATCH "1\.([1-9])\.." HUNSPELL_MATCH ${HUNSPELL_VERSION})
 #set(HUNSPELL_MINOR_VERSION ${CMAKE_MATCH_1})
 if(CMAKE_MATCH_1 GREATER 4)
-	set(HUNSPELL_NEWAPI 1)
+	set(HUNSPELL_NEWAPI ON)
 	message(STATUS "New HUNSPELL API found. Hunspell version ${HUNSPELL_VERSION}")
 	message(STATUS "HUNSPELL INCLUDE ${HUNSPELL_INCLUDE_DIR}")
 	message(STATUS "HUNSPELL LIBRARIES ${HUNSPELL_LIBRARIES}")

Modified: trunk/Scribus/cmake/modules/FindLCMS.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/FindLCMS.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLCMS.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindLCMS.cmake	Mon Jun 10 15:20:41 2019
@@ -42,20 +42,20 @@
 message("LCMS Library: ${LCMS_LIBRARY}")
 
 if (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
-  set( LCMS_FOUND 1 )
-  set( LCMS_LIBRARIES ${LCMS_LIBRARY} )
+	set( LCMS_FOUND ON )
+	set( LCMS_LIBRARIES ${LCMS_LIBRARY} )
 else (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
-  set( LCMS_FOUND 0 )
+	set( LCMS_FOUND OFF )
 endif (LCMS_LIBRARY AND LCMS_INCLUDE_DIR)
 
-set(LCMS_FIND_QUIETLY 1)
+set(LCMS_FIND_QUIETLY ON)
 
 if (LCMS_FOUND)
-  if (NOT LCMS_FIND_QUIETLY)
-    message(STATUS "Found LittleCMS: ${LCMS_LIBRARY}")
-  endif (NOT LCMS_FIND_QUIETLY)
+	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)
+	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=23014&path=/trunk/Scribus/cmake/modules/FindLCMS2.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLCMS2.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindLCMS2.cmake	Mon Jun 10 15:20:41 2019
@@ -42,20 +42,20 @@
 message("LCMS 2 Library: ${LCMS2_LIBRARY}")
 
 if (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
-  set( LCMS2_FOUND 1 )
-  set( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
+	set( LCMS2_FOUND ON )
+	set( LCMS2_LIBRARIES ${LCMS2_LIBRARY} )
 else (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
-  set( LCMS2_FOUND 0 )
+	set( LCMS2_FOUND OFF )
 endif (LCMS2_LIBRARY AND LCMS2_INCLUDE_DIR)
 
-set(LCMS2_FIND_QUIETLY 1)
+set(LCMS2_FIND_QUIETLY ON)
 
 if (LCMS2_FOUND)
-  if (NOT LCMS2_FIND_QUIETLY)
-	message(STATUS "Found LittleCMS 2: ${LCMS2_LIBRARY}")
-  endif (NOT LCMS2_FIND_QUIETLY)
+	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)
+	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=23014&path=/trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake	Mon Jun 10 15:20:41 2019
@@ -1,37 +1,37 @@
 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)
+	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
-  NAMES podofo/podofo.h
-  PATHS 
-    "${LIBPODOFO_DIR}/include"
-    "${LIBPODOFO_DIR}/src"
-    "${LIBPODOFO_DIR}"
-    /usr/include
-    /usr/local/include
-  )
-	
-set(LIBPODOFO_FIND_QUIETLY 1)
-	
+	NAMES podofo/podofo.h
+	PATHS
+	"${LIBPODOFO_DIR}/include"
+	"${LIBPODOFO_DIR}/src"
+	"${LIBPODOFO_DIR}"
+	/usr/include
+	/usr/local/include
+	)
+
+set(LIBPODOFO_FIND_QUIETLY ON)
+
 find_library(LIBPODOFO_LIBRARY
-  NAMES libpodofo podofo
-  PATHS 
-    "${LIBPODOFO_DIR}/lib" 
-    "${LIBPODOFO_DIR}/src" 
-    "${LIBPODOFO_DIR}"
-    /usr/lib /usr/local/lib
-)
+	NAMES libpodofo podofo
+	PATHS
+	"${LIBPODOFO_DIR}/lib"
+	"${LIBPODOFO_DIR}/src"
+	"${LIBPODOFO_DIR}"
+	/usr/lib /usr/local/lib
+	)
 
 if(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)
 	file(STRINGS "${LIBPODOFO_INCLUDE_DIR}/podofo/base/podofo_config.h" PODOFO_MAJOR_VER_LINE REGEX "^#define[ \t]+PODOFO_VERSION_MAJOR[ \t]+[0-9]+$")
@@ -64,18 +64,15 @@
 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(LIBPODOFO_LIBRARY)
-    message("podofo lib: ${LIBPODOFO_LIBRARY}")
-  else(LIBPODOFO_LIBRARY)
-    message("podofo lib: not found")
-  endif(LIBPODOFO_LIBRARY)
-  
-  message("PoDoFo cflags: ${useshared}")
-  
+	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)
+	message("PoDoFo cflags: ${useshared}")
 endif(NOT LIBPODOFO_FIND_QUIETLY)

Modified: trunk/Scribus/cmake/modules/FindOSG.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/FindOSG.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindOSG.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindOSG.cmake	Mon Jun 10 15:20:41 2019
@@ -10,87 +10,87 @@
 # Created by Robert Osfield. 
 
 find_path(OSG_INCLUDE_DIR osg/Node
-    ${OSG_DIR}/include
-    $ENV{OSG_DIR}/include
-    $ENV{OSG_DIR}
-    $ENV{OSGDIR}/include
-    $ENV{OSGDIR}
-    $ENV{OSG_ROOT}/include
-    NO_DEFAULT_PATH
-)
+	${OSG_DIR}/include
+	$ENV{OSG_DIR}/include
+	$ENV{OSG_DIR}
+	$ENV{OSGDIR}/include
+	$ENV{OSGDIR}
+	$ENV{OSG_ROOT}/include
+	NO_DEFAULT_PATH
+	)
 
 find_path(OSG_INCLUDE_DIR osg/Node)
 
 macro(FIND_OSG_LIBRARY MYLIBRARY MYLIBRARYNAME)
 
-    find_library("${MYLIBRARY}_DEBUG"
-        NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
-        PATHS
-        ${OSG_DIR}/lib/Debug
-        ${OSG_DIR}/lib
-        $ENV{OSG_DIR}/lib/debug
-        $ENV{OSG_DIR}/lib
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        NO_DEFAULT_PATH
-    )
+	find_library("${MYLIBRARY}_DEBUG"
+		NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
+		PATHS
+		${OSG_DIR}/lib/Debug
+		${OSG_DIR}/lib
+		$ENV{OSG_DIR}/lib/debug
+		$ENV{OSG_DIR}/lib
+		$ENV{OSG_DIR}
+		$ENV{OSGDIR}/lib
+		$ENV{OSGDIR}
+		$ENV{OSG_ROOT}/lib
+		NO_DEFAULT_PATH
+		)
 
-    find_library("${MYLIBRARY}_DEBUG"
-        NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
-        PATHS
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/local/lib64
-        /usr/lib
-        /usr/lib64
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64
-    )
-    
-    find_library(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        ${OSG_DIR}/lib/Release
-        ${OSG_DIR}/lib
-        $ENV{OSG_DIR}/lib/Release
-        $ENV{OSG_DIR}/lib
-        $ENV{OSG_DIR}
-        $ENV{OSGDIR}/lib
-        $ENV{OSGDIR}
-        $ENV{OSG_ROOT}/lib
-        NO_DEFAULT_PATH
-    )
+	find_library("${MYLIBRARY}_DEBUG"
+		NAMES "${MYLIBRARYNAME}${CMAKE_DEBUG_POSTFIX}"
+		PATHS
+		~/Library/Frameworks
+		/Library/Frameworks
+		/usr/local/lib
+		/usr/local/lib64
+		/usr/lib
+		/usr/lib64
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+		/usr/freeware/lib64
+		)
 
-    find_library(${MYLIBRARY}
-        NAMES ${MYLIBRARYNAME}
-        PATHS
-        ~/Library/Frameworks
-        /Library/Frameworks
-        /usr/local/lib
-        /usr/local/lib64
-        /usr/lib
-        /usr/lib64
-        /sw/lib
-        /opt/local/lib
-        /opt/csw/lib
-        /opt/lib
-        [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
-        /usr/freeware/lib64
-    )
-    
-    if( NOT ${MYLIBRARY}_DEBUG)
-        if(MYLIBRARY)
-            set(${MYLIBRARY}_DEBUG ${MYLIBRARY})
-         endif(MYLIBRARY)
-    endif( NOT ${MYLIBRARY}_DEBUG)
-           
+	find_library(${MYLIBRARY}
+		NAMES ${MYLIBRARYNAME}
+		PATHS
+		${OSG_DIR}/lib/Release
+		${OSG_DIR}/lib
+		$ENV{OSG_DIR}/lib/Release
+		$ENV{OSG_DIR}/lib
+		$ENV{OSG_DIR}
+		$ENV{OSGDIR}/lib
+		$ENV{OSGDIR}
+		$ENV{OSG_ROOT}/lib
+		NO_DEFAULT_PATH
+		)
+
+	find_library(${MYLIBRARY}
+		NAMES ${MYLIBRARYNAME}
+		PATHS
+		~/Library/Frameworks
+		/Library/Frameworks
+		/usr/local/lib
+		/usr/local/lib64
+		/usr/lib
+		/usr/lib64
+		/sw/lib
+		/opt/local/lib
+		/opt/csw/lib
+		/opt/lib
+		[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+		/usr/freeware/lib64
+		)
+
+	if( NOT ${MYLIBRARY}_DEBUG)
+		if(MYLIBRARY)
+			set(${MYLIBRARY}_DEBUG ${MYLIBRARY})
+		endif(MYLIBRARY)
+	endif( NOT ${MYLIBRARY}_DEBUG)
+
 endmacro(FIND_OSG_LIBRARY LIBRARY LIBRARYNAME)
 
 FIND_OSG_LIBRARY(OSG_LIBRARY osg)

Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake	Mon Jun 10 15:20:41 2019
@@ -12,37 +12,37 @@
 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
-)
+	NAMES poppler-config.h
+	PATHS ${PKG_POPPLER_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS} /usr/local/include /usr/include
+	PATH_SUFFIXES poppler
+	NO_DEFAULT_PATH
+	)
 
 find_path(POPPLER_CPP_INCLUDE_DIR 
-  NAMES poppler-version.h
-  PATHS ${PKG_POPPLER_CPP_INCLUDE_DIRS} ${POPPLER_CPP_INCLUDE_DIRS} /usr/local/include /usr/include
-  PATH_SUFFIXES poppler
-  NO_DEFAULT_PATH
-)
+	NAMES poppler-version.h
+	PATHS ${PKG_POPPLER_CPP_INCLUDE_DIRS} ${POPPLER_CPP_INCLUDE_DIRS} /usr/local/include /usr/include
+	PATH_SUFFIXES poppler
+	NO_DEFAULT_PATH
+	)
 
 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
-)
+	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
+	)
 
 find_library(POPPLER_CPP_LIBRARY
-  NAMES libpoppler-cpp poppler-cpp
-  PATHS ${PKG_POPPLER_CPP_LIBRARIES} ${POPPLER_CPP_LIBRARY_DIRS} /usr/local/lib /usr/lib /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
-  PATH_SUFFIXES poppler
-  NO_DEFAULT_PATH
-)
+	NAMES libpoppler-cpp poppler-cpp
+	PATHS ${PKG_POPPLER_CPP_LIBRARIES} ${POPPLER_CPP_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 AND POPPLER_CPP_INCLUDE_DIR)
-	set( FOUND_POPPLER 1 )
-    set( POPPLER_LIBRARIES ${POPPLER_LIBRARY} ${POPPLER_CPP_LIBRARY} )
-    set( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR} ${POPPLER_CPP_INCLUDE_DIR} )
-  endif (POPPLER_INCLUDE_DIR AND POPPLER_CPP_INCLUDE_DIR)
+	if (POPPLER_INCLUDE_DIR AND POPPLER_CPP_INCLUDE_DIR)
+		set( FOUND_POPPLER ON )
+		set( POPPLER_LIBRARIES ${POPPLER_LIBRARY} ${POPPLER_CPP_LIBRARY} )
+		set( POPPLER_INCLUDES ${POPPLER_INCLUDE_DIR} ${POPPLER_CPP_INCLUDE_DIR} )
+	endif (POPPLER_INCLUDE_DIR AND POPPLER_CPP_INCLUDE_DIR)
 endif (POPPLER_LIBRARY)

Modified: trunk/Scribus/cmake/modules/FindZLIB.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/FindZLIB.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindZLIB.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindZLIB.cmake	Mon Jun 10 15:20:41 2019
@@ -7,8 +7,8 @@
 
 
 if (ZLIB_INCLUDE_DIR)
-  # Already in cache, be silent
-  set(ZLIB_FIND_QUIETLY TRUE)
+	# Already in cache, be silent
+	set(ZLIB_FIND_QUIETLY TRUE)
 endif (ZLIB_INCLUDE_DIR)
 
 find_path(ZLIB_INCLUDE_DIR zlib.h)
@@ -20,24 +20,24 @@
 # To use this, you must use FindQt before FindZlib.
 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)
 
-  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})
+	# 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})
 
-  include(LibraryDebugAndRelease)
-  SET_LIBRARY_FROM_DEBUG_AND_RELEASE(ZLIB)
+	include(LibraryDebugAndRelease)
+	SET_LIBRARY_FROM_DEBUG_AND_RELEASE(ZLIB)
 
 endif(QT_QTCORE_LIBRARY AND USE_QT_ZLIB_PNGLIB)
 
@@ -47,9 +47,9 @@
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 
 if(ZLIB_FOUND)
-  set( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
+	set( ZLIB_LIBRARIES ${ZLIB_LIBRARY} )
 else(ZLIB_FOUND)
-  set( ZLIB_LIBRARIES )
+	set( ZLIB_LIBRARIES )
 endif(ZLIB_FOUND)
 
 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=23014&path=/trunk/Scribus/cmake/modules/LibXml2Config.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/LibXml2Config.cmake	(original)
+++ trunk/Scribus/cmake/modules/LibXml2Config.cmake	Mon Jun 10 15:20:41 2019
@@ -17,27 +17,27 @@
 set(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
 
 find_path(LIBXML2_INCLUDE_DIR libxml/xpath.h
-  PATHS ${_LibXml2IncDir} PATH_SUFFIXES libxml2
-)
+	PATHS ${_LibXml2IncDir} PATH_SUFFIXES libxml2
+	)
 
 find_library(LIBXML2_LIBRARIES NAMES xml2 libxml2
-  PATHS ${_LibXml2LinkDir}
-)
+	PATHS ${_LibXml2LinkDir}
+	)
 
 if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
-   set(LIBXML2_FOUND TRUE)
+	set(LIBXML2_FOUND TRUE)
 endif (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES)
 
-set(LibXml2_FIND_QUIETLY 1)
+set(LibXml2_FIND_QUIETLY ON)
 
 if (LIBXML2_FOUND)
-  if (NOT LibXml2_FIND_QUIETLY)
-    message(STATUS "Found LibXml2: ${LIBXML2_LIBRARIES}")
-  endif (NOT LibXml2_FIND_QUIETLY)
+	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)
+	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=23014&path=/trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake	(original)
+++ trunk/Scribus/cmake/modules/LibraryDebugAndRelease.cmake	Mon Jun 10 15:20:41 2019
@@ -8,18 +8,18 @@
 #
 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)

Modified: trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake	(original)
+++ trunk/Scribus/cmake/modules/SCRIBUSQTConfig.cmake	Mon Jun 10 15:20:41 2019
@@ -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}
-        COMMAND ${QT_UIC_EXECUTABLE}
-        ARGS -o ${outfile} ${infile}
-        MAIN_DEPENDENCY ${infile})
-      set(${outfiles} ${${outfiles}} ${outfile})
-    endforeach(it)
+	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)
 
-  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 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)
 
-    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}
-        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)
+	foreach(it ${ARGN})
+		get_filename_component(outfilename ${it} NAME_WE)
 
-  endmacro(SCRIBUS_QT_WRAP_CPP)
+		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)
+
+endmacro(SCRIBUS_QT_WRAP_CPP)

Modified: trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23014&path=/trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake	(original)
+++ trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake	Mon Jun 10 15:20:41 2019
@@ -29,38 +29,38 @@
 
 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)
+	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)




More information about the scribus-commit mailing list