r23407 by craig - #15980: CMake cleanup #5

[scribus-commit]

Author: craig
Date: Mon Dec  9 22:39:03 2019
New Revision: 23407

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

Modified:
    trunk/Scribus/cmake/modules/FindGMAGICK.cmake
    trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
    trunk/Scribus/cmake/modules/FindLCMS2.cmake
    trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake

Modified: trunk/Scribus/cmake/modules/FindGMAGICK.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindGMAGICK.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindGMAGICK.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindGMAGICK.cmake	Mon Dec  9 22:39:03 2019
@@ -24,7 +24,7 @@
   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}")
+#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)

Modified: trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindHUNSPELL.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindHUNSPELL.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindHUNSPELL.cmake	Mon Dec  9 22:39:03 2019
@@ -33,9 +33,4 @@
 	message(STATUS "HUNSPELL LIBRARIES ${HUNSPELL_LIBRARIES}")
 endif()
 
-#find_path(HUNSPELL_INCLUDE_DIR hunspell/hunspell.hxx )
-#find_library(HUNSPELL_LIBRARIES NAMES hunspell-1.5 hunspell-1.4 hunspell-1.3 hunspell-1.2 PATHS /opt/local/lib /usr/local/lib /usr/lib )
-#include(FindPackageHandleStandardArgs)
-#FIND_PACKAGE_HANDLE_STANDARD_ARGS(HUNSPELL DEFAULT_MSG HUNSPELL_LIBRARIES HUNSPELL_INCLUDE_DIR )
-
 mark_as_advanced(HUNSPELL_INCLUDE_DIR HUNSPELL_LIBRARIES)

Modified: trunk/Scribus/cmake/modules/FindLCMS2.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindLCMS2.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLCMS2.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindLCMS2.cmake	Mon Dec  9 22:39:03 2019
@@ -19,8 +19,6 @@
 # set(LCMS2_LIBS ${_lcmsCflags})
 
 find_path(LCMS2_INCLUDE_DIR lcms2.h
-  /usr/include
-  /usr/local/include
   PATH_SUFFIXES lcms2
 )
 

Modified: trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23407&path=/trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake
==============================================================================
--- trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake	(original)
+++ trunk/Scribus/cmake/modules/FindLIBPODOFO.cmake	Mon Dec  9 22:39:03 2019
@@ -18,8 +18,6 @@
 	"${LIBPODOFO_DIR}/include"
 	"${LIBPODOFO_DIR}/src"
 	"${LIBPODOFO_DIR}"
-	/usr/include
-	/usr/local/include
 	)
 
 set(LIBPODOFO_FIND_QUIETLY ON)
@@ -30,7 +28,6 @@
 	"${LIBPODOFO_DIR}/lib"
 	"${LIBPODOFO_DIR}/src"
 	"${LIBPODOFO_DIR}"
-	/usr/lib /usr/local/lib
 	)
 
 if(LIBPODOFO_INCLUDE_DIR AND LIBPODOFO_LIBRARY)