diff options
| author | Orcan Ogetbil <oget.fedora@gmail.com> | 2012-07-08 06:23:25 +0000 |
|---|---|---|
| committer | Orcan Ogetbil <oget.fedora@gmail.com> | 2012-07-08 06:23:25 +0000 |
| commit | edd120313caf03650daf32c7b9c383188061b5bc (patch) | |
| tree | d88b7ad6102146d9773013f09710720cdcae1c44 | |
| parent | cb8157ddafc3753b1e79d33495d5a4fdca7c735b (diff) | |
use FindPythonLibs to detect Python
| -rw-r--r-- | muse2/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | muse2/ChangeLog | 2 |
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) |