|
|
|
@ -352,12 +352,9 @@ else()
|
|
|
|
|
set(VERSION_FLAVOR "Development Build")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
# These are required in .rc files and manifests
|
|
|
|
|
set(VERSION_MAJOR ${PROJECT_MAJOR_VERSION})
|
|
|
|
|
set(VERSION_MINOR ${PROJECT_MINOR_VERSION})
|
|
|
|
|
set(VERSION_MICRO ${PROJECT_PATCH_VERSION})
|
|
|
|
|
set(VERSION_BUILD ${PROJECT_BUILD_VERSION})
|
|
|
|
|
# Used in .rc files and manifests
|
|
|
|
|
set(RC_VERSION ${PROJECT_MAJOR_VERSION},${PROJECT_MINOR_VERSION},${PROJECT_PATCH_VERSION},${PROJECT_BUILD_VERSION})
|
|
|
|
|
set(LOG_RC_VERSION ${LOG_PROJECT_MAJOR_VERSION},${LOG_PROJECT_MINOR_VERSION},${PROJECT_PATCH_VERSION},${PROJECT_BUILD_VERSION})
|
|
|
|
|
|
|
|
|
|
message(STATUS "V: ${PROJECT_VERSION}, MaV: ${PROJECT_MAJOR_VERSION}, MiV: ${PROJECT_MINOR_VERSION}, PL: ${PROJECT_PATCH_VERSION}, EV: ${PROJECT_VERSION_EXTENSION}.")
|
|
|
|
|
|
|
|
|
@ -1688,7 +1685,6 @@ foreach(_plugin_src_dir ${PLUGIN_SRC_DIRS} ${LOGWOLF_PLUGIN_SRC_DIRS})
|
|
|
|
|
add_subdirectory( ${_plugin_src_dir} )
|
|
|
|
|
endforeach()
|
|
|
|
|
|
|
|
|
|
set( VERSION ${PROJECT_VERSION} )
|
|
|
|
|
if(VCSVERSION_OVERRIDE)
|
|
|
|
|
# Allow distributors to override detection of the Git tag and version.
|
|
|
|
|
string(CONFIGURE "#define VCSVERSION \"@VCSVERSION_OVERRIDE@\"\n"
|
|
|
|
@ -2182,7 +2178,7 @@ if(USE_REPOSITORY)
|
|
|
|
|
if(ZIP_EXECUTABLE)
|
|
|
|
|
add_custom_target(pdb_zip_package COMMENT "This packages .PDBs but will not create them.")
|
|
|
|
|
set_target_properties(pdb_zip_package PROPERTIES FOLDER "Packaging")
|
|
|
|
|
set(_pdb_zip "${CMAKE_BINARY_DIR}/Wireshark-pdb-${WIRESHARK_TARGET_PLATFORM}-${VERSION}.zip")
|
|
|
|
|
set(_pdb_zip "${CMAKE_BINARY_DIR}/Wireshark-pdb-${WIRESHARK_TARGET_PLATFORM}-${PROJECT_VERSION}.zip")
|
|
|
|
|
file(TO_NATIVE_PATH "${_pdb_zip}" _pdb_zip_win)
|
|
|
|
|
add_custom_command(TARGET pdb_zip_package POST_BUILD
|
|
|
|
|
COMMAND ${CMAKE_COMMAND} -E remove -f "${_pdb_zip}"
|
|
|
|
@ -3420,7 +3416,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
|
|
|
|
|
endif()
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
string(REPLACE "-" "_" RPM_VERSION "${VERSION}")
|
|
|
|
|
string(REPLACE "-" "_" RPM_VERSION "${PROJECT_VERSION}")
|
|
|
|
|
configure_file(packaging/rpm/wireshark.spec.in ${CMAKE_BINARY_DIR}/packaging/rpm/SPECS/wireshark.spec)
|
|
|
|
|
if(RPMBUILD_EXECUTABLE)
|
|
|
|
|
foreach(_rpm_dir BUILD RPMS SOURCES SPECS SRPMS)
|
|
|
|
|