summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--muse2/CMakeLists.txt10
-rw-r--r--muse2/ChangeLog2
2 files changed, 8 insertions, 4 deletions
diff --git a/muse2/CMakeLists.txt b/muse2/CMakeLists.txt
index 3d91aa7e..a10c7a6d 100644
--- a/muse2/CMakeLists.txt
+++ b/muse2/CMakeLists.txt
@@ -247,10 +247,12 @@ endif (ENABLE_OSC)
##
if (ENABLE_PYTHON)
- PKG_CHECK_MODULES(PYTHON python>=2.4)
- if (PYTHON_FOUND)
- set(PYTHON_SUPPORT ON)
- endif (PYTHON_FOUND)
+ include(FindPythonLibs)
+ if (PYTHONLIBS_FOUND)
+ if (NOT PYTHONLIBS_VERSION_STRING VERSION_LESS 2.4)
+ set(PYTHON_SUPPORT ON)
+ endif (NOT PYTHONLIBS_VERSION_STRING VERSION_LESS 2.4)
+ endif (PYTHONLIBS_FOUND)
endif (ENABLE_PYTHON)
##
diff --git a/muse2/ChangeLog b/muse2/ChangeLog
index 93993808..12fae57e 100644
--- a/muse2/ChangeLog
+++ b/muse2/ChangeLog
@@ -1,3 +1,5 @@
+08.07.2012:
+ - Use cmake's own FindPythonLibs module instead of pkgconfig to detect Python (Orcan)
06.07.2012:
- Updated Czech translation from Pavel Fric (rj)
- Some strings that were not translatable are now (as reported by Pavel Fric) (rj)