r23399 by craig - #15980: Start of CMake cleanup

[scribus-commit]

Author: craig
Date: Sun Dec  8 12:13:30 2019
New Revision: 23399

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23399
Log:
#15980: Start of CMake cleanup

Added:
    trunk/Scribus/cmake/modules/old/LibXml2Config.cmake
      - copied unchanged from r23398, trunk/Scribus/cmake/modules/LibXml2Config.cmake
    trunk/Scribus/cmake/modules/old/ScribusFindPackageHandleStandardArgs.cmake
      - copied unchanged from r23398, trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake
Modified:
    trunk/Scribus/cmake/modules/CAIROConfig.cmake
    trunk/Scribus/cmake/modules/FindHYPHEN.cmake
    trunk/Scribus/cmake/modules/FindPOPPLER.cmake
    trunk/Scribus/cmake/modules/FindZLIB.cmake
    trunk/Scribus/cmake/modules/LibXml2Config.cmake
    trunk/Scribus/cmake/modules/ScribusFindPackageHandleStandardArgs.cmake

Modified: trunk/Scribus/cmake/modules/CAIROConfig.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/CAIROConfig.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/CAIROConfig.cmake	(original)
+++ trunk/Scribus/cmake/modules/CAIROConfig.cmake	Sun Dec  8 12:13:30 2019
@@ -18,15 +18,8 @@
 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)
-    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)
-    pkg_search_module(CAIRO REQUIRED libcairo>=1.14.0 cairo>=1.14.0)
-  endif (${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(PREFIX_CAIRO)
 
 find_path(CAIRO_INCLUDE_DIR 

Modified: trunk/Scribus/cmake/modules/FindHYPHEN.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/FindHYPHEN.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindHYPHEN.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindHYPHEN.cmake	Sun Dec  8 12:13:30 2019
@@ -20,7 +20,7 @@
 
 # handle the QUIETLY and REQUIRED arguments and set HYPHEN_FOUND to TRUE if 
 # all listed variables are TRUE
-include(ScribusFindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(HYPHEN DEFAULT_MSG HYPHEN_LIBRARY HYPHEN_INCLUDE_DIR)
 
 if(HYPHEN_FOUND)

Modified: trunk/Scribus/cmake/modules/FindPOPPLER.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/FindPOPPLER.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindPOPPLER.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindPOPPLER.cmake	Sun Dec  8 12:13:30 2019
@@ -1,15 +1,8 @@
-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)
-	pkg_search_module(POPPLER libpoppler>=0.58.0 poppler>=0.58.0)
-	if (POPPLER_FOUND)
-		pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.58.0 poppler-cpp>=0.58.0)
-	endif(POPPLER_FOUND)
-endif (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.5)
+include(FindPkgConfig)
+pkg_search_module(POPPLER libpoppler>=0.58.0 poppler>=0.58.0)
+if (POPPLER_FOUND)
+	pkg_search_module(POPPLER_CPP REQUIRED libpoppler-cpp>=0.58.0 poppler-cpp>=0.58.0)
+endif(POPPLER_FOUND)
  
 find_path(POPPLER_INCLUDE_DIR 
 	NAMES poppler-config.h

Modified: trunk/Scribus/cmake/modules/FindZLIB.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23399&path=/trunk/Scribus/cmake/modules/FindZLIB.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindZLIB.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindZLIB.cmake	Sun Dec  8 12:13:30 2019
@@ -43,7 +43,7 @@
 
 # handle the QUIETLY and REQUIRED arguments and set ZLIB_FOUND to TRUE if 
 # all listed variables are TRUE
-include(ScribusFindPackageHandleStandardArgs)
+include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(ZLIB DEFAULT_MSG ZLIB_LIBRARY ZLIB_INCLUDE_DIR)
 
 if(ZLIB_FOUND)