r24473 by jghali - Remove some unused stuff from cmake files

[scribus-commit]

Author: jghali
Date: Fri Feb 12 21:28:52 2021
New Revision: 24473

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=24473
Log:
Remove some unused stuff from cmake files

Modified:
    trunk/Scribus/CMakeLists_Dependencies.cmake
    trunk/Scribus/config.h.cmake

Modified: trunk/Scribus/CMakeLists_Dependencies.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24473&path=/trunk/Scribus/CMakeLists_Dependencies.cmake
==============================================================================
--- trunk/Scribus/CMakeLists_Dependencies.cmake	(original)
+++ trunk/Scribus/CMakeLists_Dependencies.cmake	Fri Feb 12 21:28:52 2021
@@ -138,7 +138,6 @@
 		message("Library directories: ${Python3_LIBRARY_DIRS}")
 		message("Runtime library directories: ${Python3_RUNTIME_LIBRARY_DIRS}")
 		set(HAVE_PYTHON ON)
-		set(COMPILE_PYTHON ON)
 	endif()
 else()
 	message("Python 2.x Requested")
@@ -150,7 +149,6 @@
 		message("Library directories: ${Python2_LIBRARY_DIRS}")
 		message("Runtime library directories: ${Python2_RUNTIME_LIBRARY_DIRS}")
 		set(HAVE_PYTHON ON)
-		set(COMPILE_PYTHON ON)
 	endif()
 endif()
 #>> PYTHON
@@ -167,6 +165,7 @@
 set(cairo_DIR ${CMAKE_MODULE_PATH})
 find_package(cairo REQUIRED)
 if(cairo_FOUND)
+	set(HAVE_CAIRO ON)
 	message("cairo Library found OK")
 else()
 	message(FATAL_ERROR "No cairo library found")

Modified: trunk/Scribus/config.h.cmake
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=24473&path=/trunk/Scribus/config.h.cmake
==============================================================================
--- trunk/Scribus/config.h.cmake	(original)
+++ trunk/Scribus/config.h.cmake	Fri Feb 12 21:28:52 2021
@@ -26,16 +26,13 @@
 #cmakedefine HAVE_HARFBUZZ_SUBSET 1
 #cmakedefine HAVE_PODOFO 1
 #cmakedefine HAVE_POPPLER 1
+#cmakedefine HAVE_PYTHON 1
 #cmakedefine HAVE_OSG 1
 #cmakedefine HAVE_MEMRCHR 1
 #cmakedefine HAVE_BOOST 1
-#cmakedefine HAVE_SINCOS
-#cmakedefine HAVE_ROUND
-#cmakedefine HAVE_TRUNC
 #cmakedefine HAVE_SYS_TYPES_H 1
 #cmakedefine HAVE_SYS_STAT_H 1
 #cmakedefine FT_FREETYPE_H
-#cmakedefine COMPILE_PYTHON 1
 #cmakedefine WORDS_BIGENDIAN 1
 #cmakedefine GMAGICK_FOUND 1
 #cmakedefine WITH_TESTS 1