"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "CMakeLists.txt" between
wireshark-3.4.5.tar.xz and wireshark-3.4.6.tar.xz

About: Wireshark is a network protocol analyzer. It lets you capture and interactively browse the traffic running on a computer network.

CMakeLists.txt  (wireshark-3.4.5.tar.xz):CMakeLists.txt  (wireshark-3.4.6.tar.xz)
skipping to change at line 38 skipping to change at line 38
else() else()
set(_project_name wireshark) set(_project_name wireshark)
endif() endif()
project(${_project_name} C CXX) project(${_project_name} C CXX)
# Updated by tools/make-version.pl # Updated by tools/make-version.pl
set(GIT_REVISION 0) set(GIT_REVISION 0)
set(PROJECT_MAJOR_VERSION 3) set(PROJECT_MAJOR_VERSION 3)
set(PROJECT_MINOR_VERSION 4) set(PROJECT_MINOR_VERSION 4)
set(PROJECT_PATCH_VERSION 5) set(PROJECT_PATCH_VERSION 6)
set(PROJECT_BUILD_VERSION ${GIT_REVISION}) set(PROJECT_BUILD_VERSION ${GIT_REVISION})
set(PROJECT_VERSION_EXTENSION "") set(PROJECT_VERSION_EXTENSION "")
if(DEFINED ENV{WIRESHARK_VERSION_EXTRA}) if(DEFINED ENV{WIRESHARK_VERSION_EXTRA})
set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}") set(PROJECT_VERSION_EXTENSION "$ENV{WIRESHARK_VERSION_EXTRA}")
endif() endif()
set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT _PATCH_VERSION}${PROJECT_VERSION_EXTENSION}") set(PROJECT_VERSION "${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT _PATCH_VERSION}${PROJECT_VERSION_EXTENSION}")
set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}") set(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
skipping to change at line 1117 skipping to change at line 1117
set(ENABLE_LIBSSH OFF) set(ENABLE_LIBSSH OFF)
endif() endif()
ws_find_package(LIBSSH ENABLE_LIBSSH HAVE_LIBSSH "0.6") ws_find_package(LIBSSH ENABLE_LIBSSH HAVE_LIBSSH "0.6")
ws_find_package(PCAP ENABLE_PCAP HAVE_LIBPCAP) ws_find_package(PCAP ENABLE_PCAP HAVE_LIBPCAP)
ws_find_package(AIRPCAP ENABLE_AIRPCAP HAVE_AIRPCAP) ws_find_package(AIRPCAP ENABLE_AIRPCAP HAVE_AIRPCAP)
ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD) ws_find_package(Systemd BUILD_sdjournal HAVE_SYSTEMD)
# Build the Qt GUI? # Build the Qt GUI?
if(BUILD_wireshark) if(BUILD_wireshark)
if(NOT CMAKE_VERSION VERSION_LESS "3.10.0")
set(CMAKE_AUTOMOC ON)
set(CMAKE_AUTOUIC ON)
set(CMAKE_AUTORCC ON)
endif()
# Untested, may not work if CMAKE_PREFIX_PATH gets overwritten # Untested, may not work if CMAKE_PREFIX_PATH gets overwritten
# somewhere. The if WIN32 in this place is annoying as well. # somewhere. The if WIN32 in this place is annoying as well.
if(WIN32) if(WIN32)
set(QT5_BASE_PATH "$ENV{QT5_BASE_DIR}") set(QT5_BASE_PATH "$ENV{QT5_BASE_DIR}")
set(CMAKE_PREFIX_PATH "${QT5_BASE_PATH}") set(CMAKE_PREFIX_PATH "${QT5_BASE_PATH}")
endif() endif()
if(APPLE AND EXISTS /usr/local/opt/qt5) if(APPLE AND EXISTS /usr/local/opt/qt5)
# Homebrew installs Qt5 (up to at least 5.11.0) in # Homebrew installs Qt5 (up to at least 5.11.0) in
# /usr/local/qt5. Ensure that it can be found by CMake # /usr/local/qt5. Ensure that it can be found by CMake
# since it is not in the default /usr/local prefix. # since it is not in the default /usr/local prefix.
skipping to change at line 2387 skipping to change at line 2381
add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_B UNDLE_FILES}) add_executable(wireshark WIN32 MACOSX_BUNDLE ${wireshark_FILES} ${EXTRA_B UNDLE_FILES})
if(WIN32) if(WIN32)
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_ST ARTUP_PROJECT wireshark) set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_ST ARTUP_PROJECT wireshark)
endif() endif()
set(PROGLIST ${PROGLIST} wireshark) set(PROGLIST ${PROGLIST} wireshark)
set_target_properties(wireshark PROPERTIES set_target_properties(wireshark PROPERTIES
LINK_FLAGS "${WS_LINK_FLAGS}" LINK_FLAGS "${WS_LINK_FLAGS}"
FOLDER "Executables" FOLDER "Executables"
INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}" INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
AUTOMOC ON
AUTOUIC ON
AUTORCC ON
) )
if(ENABLE_APPLICATION_BUNDLE OR WIN32) if(ENABLE_APPLICATION_BUNDLE OR WIN32)
set_target_properties(wireshark PROPERTIES OUTPUT_NAME Wireshark) set_target_properties(wireshark PROPERTIES OUTPUT_NAME Wireshark)
endif() endif()
if(ENABLE_APPLICATION_BUNDLE) if(ENABLE_APPLICATION_BUNDLE)
add_dependencies(wireshark manpages) add_dependencies(wireshark manpages)
set_target_properties( set_target_properties(
wireshark PROPERTIES wireshark PROPERTIES
MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/pack aging/macosx/Info.plist MACOSX_BUNDLE_INFO_PLIST ${CMAKE_BINARY_DIR}/pack aging/macosx/Info.plist
 End of changes. 3 change blocks. 
7 lines changed or deleted 4 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)