diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2014-06-17 02:44:05 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2014-06-17 00:44:53 +0000 |
| commit | 289aa37d8d8d9570517b331f57063bc4f166809d (patch) | |
| tree | 289256672683f7eb6906255e5d07f2d920ac3f04 | |
| parent | 11243e3977291c2b7bcacf5be5bbe0bde09ba773 (diff) | |
Remove detection of Python libraries: They are not used anymore.
Change-Id: If42bb16d5c6202889ff933af6c9d974866d2a950
Reviewed-on: https://code.wireshark.org/review/2290
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
| -rw-r--r-- | CMakeLists.txt | 6 | ||||
| -rw-r--r-- | CMakeOptions.txt | 1 |
2 files changed, 0 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 97a4afe773..f93d4f199b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -575,10 +575,6 @@ if(ENABLE_CAP) set(PACKAGELIST ${PACKAGELIST} CAP SETCAP) endif() -if(ENABLE_PYTHON) - set(PACKAGELIST ${PACKAGELIST} PythonLibs) -endif() - if (NOT WIN32) set(PACKAGELIST ${PACKAGELIST} YAPP) endif() @@ -600,8 +596,6 @@ foreach(PACKAGE ${PACKAGELIST}) set(PACKAGE_VAR "QT") elseif(${PACKAGE} STREQUAL "PythonInterp") set(PACKAGE_VAR "PYTHONINTERP") - elseif(${PACKAGE} STREQUAL "PythonLibs") - set(PACKAGE_VAR "PYTHONLIBS") elseif(${PACKAGE} STREQUAL "Gettext") set(PACKAGE_VAR "GETTEXT") elseif(${PACKAGE} STREQUAL "HtmlViewer") diff --git a/CMakeOptions.txt b/CMakeOptions.txt index 9ccba66a6c..5e9f681b9d 100644 --- a/CMakeOptions.txt +++ b/CMakeOptions.txt @@ -56,7 +56,6 @@ else() endif() option(ENABLE_ZLIB "Build with zlib compression support" ON) option(ENABLE_LUA "Build with Lua dissector support" ON) -option(ENABLE_PYTHON "Build with Python dissector support" OFF) option(ENABLE_SMI "Build with libsmi snmp support" ON) option(ENABLE_GNUTLS "Build with GNU TLS support" ON) option(ENABLE_GCRYPT "Build with GNU crypto support" ON) |