From cd160c7af269d60a69f009ab72d363b32b66eb03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Mayer?= Date: Wed, 1 May 2013 00:53:59 +0000 Subject: Our scripts do ont work with python3, so only pick up a python2 executable. Reported on #wireshark by McEnroe svn path=/trunk/; revision=49102 --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'CMakeLists.txt') 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 ? -- cgit v1.2.1