diff options
author | Jörg Mayer <jmayer@loplof.de> | 2013-05-01 09:20:59 +0000 |
---|---|---|
committer | Jörg Mayer <jmayer@loplof.de> | 2013-05-01 09:20:59 +0000 |
commit | 30653b7e16696fc4be08eb052c8ed16c6baedbdc (patch) | |
tree | 325085f09d3e7274537c93d7a50d924570e6d1ab /CMakeLists.txt | |
parent | e9f90d8c42f1066ce8817222f4de7138140c7cce (diff) |
- Fix logic for finding packages with differing Find-name
and returned variable-names:
Old: Provide the var name and adapt the find-name
New: Provide the find-name and adapt the var name
This allows for different packages with the same var name.
This chage effects Qt4 and PythonInterp.
- Replace self created FindPYTHON with cmake provided
FindPythonLibs.
svn path=/trunk/; revision=49105
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d137dca336..58ac864b8d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -304,8 +304,8 @@ if(BUILD_qtshark) set(PACKAGELIST ${PACKAGELIST} Qt5Widgets Qt5PrintSupport Qt5LinguistTools) set(QT_VERSION 5) else() - set(PACKAGELIST ${PACKAGELIST} QT) - # set(QT_OPTIONS 4.7.1 REQUIRED QtCore QtGui) + set(PACKAGELIST ${PACKAGELIST} Qt4) + # set(Qt4_OPTIONS 4.7.1 REQUIRED QtCore QtGui) set(QT_VERSION 4) endif() endif() @@ -368,7 +368,7 @@ if(ENABLE_CAP) endif() if(ENABLE_PYTHON) - set(PACKAGELIST ${PACKAGELIST} PYTHON) + set(PACKAGELIST ${PACKAGELIST} PythonLibs) endif() set(PACKAGELIST ${PACKAGELIST} YAPP) @@ -380,29 +380,33 @@ set(PROGLIST text2pcap mergecap capinfos editcap reordercap dumpcap) #Let's loop the package list foreach(PACKAGE ${PACKAGELIST}) - if(${PACKAGE} STREQUAL "QT") - set(PACKAGE_NAME "Qt4") + if(${PACKAGE} STREQUAL "Qt4") + set(PACKAGE_VAR "QT") + elseif(${PACKAGE} STREQUAL "PythonInterp") + set(PACKAGE_VAR "PYTHON") + elseif(${PACKAGE} STREQUAL "PythonLibs") + set(PACKAGE_VAR "PYTHON") else() - set(PACKAGE_NAME ${PACKAGE}) + set(PACKAGE_VAR ${PACKAGE}) endif() if(${PACKAGE}_OPTIONS) - find_package(${PACKAGE_NAME} ${${PACKAGE}_OPTIONS}) + find_package(${PACKAGE} ${${PACKAGE}_OPTIONS}) elseif(${PACKAGE}_REQUIRED) - find_package(${PACKAGE_NAME} REQUIRED) + find_package(${PACKAGE} REQUIRED) else() - find_package(${PACKAGE_NAME}) + find_package(${PACKAGE}) endif() - message(${PACKAGE}_FOUND) - if (${PACKAGE}_FOUND) - set(HAVE_LIB${PACKAGE} 1) - include_directories(${${PACKAGE}_INCLUDE_DIRS}) - message(STATUS "${PACKAGE} includes: ${${PACKAGE}_INCLUDE_DIRS}") - message(STATUS "${PACKAGE} libs: ${${PACKAGE}_LIBRARIES}") + message(${PACKAGE_VAR}_FOUND) + if (${PACKAGE_VAR}_FOUND) + set(HAVE_LIB${PACKAGE_VAR} 1) + include_directories(${${PACKAGE_VAR}_INCLUDE_DIRS}) + message(STATUS "${PACKAGE} includes: ${${PACKAGE_VAR}_INCLUDE_DIRS}") + message(STATUS "${PACKAGE} libs: ${${PACKAGE_VAR}_LIBRARIES}") if (${PACKAGE}_DEFINITIONS) - message(STATUS "${PACKAGE} definitions: ${${PACKAGE}_DEFINITIONS}") + message(STATUS "${PACKAGE} definitions: ${${PACKAGE_VAR}_DEFINITIONS}") endif() - if (${PACKAGE}_EXECUTABLE) - message(STATUS "${PACKAGE} executable: ${${PACKAGE}_EXECUTABLE}") + if (${PACKAGE_VAR}_EXECUTABLE) + message(STATUS "${PACKAGE} executable: ${${PACKAGE_VAR}_EXECUTABLE}") endif() endif() endforeach() @@ -410,7 +414,6 @@ 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}") |