r17955 by jghali - fix python 2.x detection when 2.x and 3.x are installed side-by-side

scribus-commit scribus-commit at lists.scribus.net
Tue Dec 11 20:39:45 UTC 2012


Author: jghali
Date: Tue Dec 11 20:39:45 2012
New Revision: 17955

URL: http://scribus.net/websvn/listing.php?repname=Scribus&sc=1&rev=17955
Log:
fix python 2.x detection when 2.x and 3.x are installed side-by-side

Modified:
    branches/Version14x/Scribus/CMakeLists.txt

Modified: branches/Version14x/Scribus/CMakeLists.txt
URL: http://scribus.net/websvn/diff.php?repname=Scribus&rev=17955&path=/branches/Version14x/Scribus/CMakeLists.txt
==============================================================================
--- branches/Version14x/Scribus/CMakeLists.txt (original)
+++ branches/Version14x/Scribus/CMakeLists.txt Tue Dec 11 20:39:45 2012
@@ -519,7 +519,7 @@
 ENDIF(PNG_FOUND)
 #>> ZLIB, PNG
 
-#<< JPEG, TIFF, PYTHON
+#<< JPEG, TIFF
 FIND_PACKAGE(JPEG REQUIRED)
 IF (JPEG_FOUND)
   MESSAGE("JPEG Library Found OK")
@@ -531,13 +531,17 @@
 ELSE(TIFF_FOUND)
   MESSAGE(FATAL_ERROR "Could not find the TIFF Library")
 ENDIF(TIFF_FOUND)
+#<< JPEG, TIFF
+
+#<< PYTHON
+SET(PythonLibs_FIND_VERSION 2)
 FIND_PACKAGE(PythonLibs REQUIRED)
 IF (PYTHON_LIBRARY)
   MESSAGE("Python Library Found OK")
   SET(HAVE_PYTHON 1)
   SET(COMPILE_PYTHON 1)
 ENDIF(PYTHON_LIBRARY)
-#>> JPEG, TIFF, PYTHON
+#>> PYTHON
 
 #<< FreeType2
 IF (${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION} LESS 2.6)




More information about the scribus-commit mailing list