diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-05-01 00:53:59 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-05-01 00:53:59 +0000 |
| commit | cd160c7af269d60a69f009ab72d363b32b66eb03 (patch) | |
| tree | 074b6dfa10183e98c9067e62e776e02cc5c0af13 /CMakeLists.txt | |
| parent | 084492924798bb0e48eb193e3c095303589810be (diff) | |
| download | wireshark-cd160c7af269d60a69f009ab72d363b32b66eb03.tar.gz | |
Our scripts do ont work with python3, so only pick up a python2
executable.
Reported on #wireshark by McEnroe
svn path=/trunk/; revision=49102
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1651d5b8f7..d137dca336 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -278,6 +278,7 @@ set(GLIB2_MIN_VERSION 2.14.0) set(GTHREAD2_REQUIRED) set(PCAP_REQUIRED) set(M_REQUIRED) +set(PythonInterp_FIND_VERSION 2) set(PACKAGELIST ${PACKAGELIST} HtmlViewer) @@ -400,12 +401,16 @@ foreach(PACKAGE ${PACKAGELIST}) if (${PACKAGE}_DEFINITIONS) message(STATUS "${PACKAGE} definitions: ${${PACKAGE}_DEFINITIONS}") endif() + if (${PACKAGE}_EXECUTABLE) + message(STATUS "${PACKAGE} executable: ${${PACKAGE}_EXECUTABLE}") + endif() endif() endforeach() #packaging include(CPackConfig.txt) +message(STATUS "Python executable: ${PYTHON_EXECUTABLE}") if(HAVE_LIBPYTHON) set(HAVE_PYTHON 1) set(PYTHON_DIR "${CMAKE_INSTALL_PREFIX}/lib/wireshark/python/${CPACK_PACKAGE_VERSION}") @@ -457,7 +462,6 @@ elseif(QT_FOUND) message(STATUS "QT includes: ${QT_INCLUDE_DIR}") message(STATUS "QT libs: ${QT_LIBRARIES}") endif() - include(ConfigureChecks.cmake) #Big or little endian ? |