r23099 by craig - #15751: Move to new Python find syntax

[scribus-commit]

Author: craig
Date: Fri Aug  2 22:13:09 2019
New Revision: 23099

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=23099
Log:
#15751: Move to new Python find syntax

Modified:
    trunk/Scribus/CMakeLists.txt
    trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt

Modified: trunk/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23099&path=/trunk/Scribus/CMakeLists.txt
==============================================================================
--- trunk/Scribus/CMakeLists.txt	(original)
+++ trunk/Scribus/CMakeLists.txt	Fri Aug  2 22:13:09 2019
@@ -846,10 +846,17 @@
 #<< JPEG, TIFF
 
 #<< PYTHON
-#set(PythonLibs_FIND_VERSION 2)
-find_package(PythonInterp 2)
-find_package(PythonLibs 2 REQUIRED)
-if (PYTHON_LIBRARY)
+#
+#find_package(PythonInterp 2)
+#find_package(PythonLibs 2 REQUIRED)
+#if (PYTHON_LIBRARY)
+#	message("Python Library Found OK")
+#	set(HAVE_PYTHON ON)
+#	set(COMPILE_PYTHON ON)
+#endif()
+#
+find_package (Python2 REQUIRED COMPONENTS Interpreter Development)
+if (Python2_Development_FOUND)
 	message("Python Library Found OK")
 	set(HAVE_PYTHON ON)
 	set(COMPILE_PYTHON ON)

Modified: trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=23099&path=/trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt
==============================================================================
--- trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt	(original)
+++ trunk/Scribus/scribus/plugins/scriptplugin/CMakeLists.txt	Fri Aug  2 22:13:09 2019
@@ -1,7 +1,7 @@
 include_directories(
 	${CMAKE_SOURCE_DIR}
 	${CMAKE_SOURCE_DIR}/scribus
-	${PYTHON_INCLUDE_PATH}
+	${Python2_INCLUDE_DIRS}
 )
 
 # 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
@@ -65,7 +65,7 @@
 )
 
 target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN}
-	${PYTHON_LIBRARIES}
+	${Python2_LIBRARIES}
 )
 
 target_link_libraries(${SCRIBUS_SCRIPTER_PLUGIN} ${PLUGIN_LIBRARIES})