osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

CMake: Don't build Windows package targets by default. 

Explicitly exclude our various Windows package targets from the Visual
Studio default build. This will hopefully keep the 32-bit Windows builder
from trying to build the portableapps_runtime target when it shouldn't.

Change-Id: Id8481e92abda9b1a4784b8c8e8b5a1b3f1b4647e
Reviewed-on: https://code.wireshark.org/review/32256
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2019-02-27 16:20:01 -08:00
parent 41c566b48d
commit a0c93f426b
3 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packaging/nsis/CMakeLists.txt
View File

@ -224,7 +224,10 @@ macro( ADD_NSIS_PACKAGE_TARGET )
faq_html
${DATAFILE_DIR}/uninstall.exe
)
set_target_properties(nsis_package_prep PROPERTIES FOLDER "Packaging")
set_target_properties(nsis_package_prep PROPERTIES
FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True
)
# Dump the installer into
# ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis
@ -234,7 +237,10 @@ macro( ADD_NSIS_PACKAGE_TARGET )
wireshark.nsi
WORKING_DIRECTORY ${_nsis_source_dir}
)
set_target_properties(nsis_package PROPERTIES FOLDER "Packaging")
set_target_properties(nsis_package PROPERTIES
FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True
)
endif()
endmacro( ADD_NSIS_PACKAGE_TARGET )

15
packaging/portableapps/CMakeLists.txt
View File

@ -43,7 +43,10 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET )
COMMAND xcopy ${_datafile_dir_native} ${_portableapps_app_dir_native} /D /I /E /Y /exclude:${_xcopy_deploy_exclude}
)
set_target_properties(portableapps_app_dir PROPERTIES FOLDER "Packaging")
set_target_properties(portableapps_app_dir PROPERTIES
FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True
)
if(MSVCR_DLL)
add_custom_target(portableapps_runtime
@ -55,7 +58,10 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET )
)
endif(MSVCR_DLL)
set_target_properties(portableapps_runtime PROPERTIES FOLDER "Packaging")
set_target_properties(portableapps_runtime PROPERTIES
FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True
)
add_dependencies(portableapps_runtime portableapps_app_dir)
# Build the PortableApps package.
@ -66,7 +72,10 @@ macro( ADD_PORTABLEAPPS_PACKAGE_TARGET )
portableapps_runtime
${_portableapps_package}
)
set_target_properties(portableapps_package PROPERTIES FOLDER "Packaging")
set_target_properties(portableapps_package PROPERTIES
FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True
)
set(PORTABLEAPPS_PACKAGE_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_MICRO}.0")
configure_file(

10
packaging/wix/CMakeLists.txt
View File

@ -279,7 +279,10 @@ macro( ADD_WIX_PACKAGE_TARGET )
user_guide_chm
faq_html
)
set_target_properties(wix_package_prep PROPERTIES FOLDER "Packaging")
set_target_properties(wix_package_prep PROPERTIES
FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True
)
# Dump the installer into
# ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix
@ -291,7 +294,10 @@ macro( ADD_WIX_PACKAGE_TARGET )
COMMAND ${WIX_LIGHT_EXECUTABLE} ${WIX_LIGHT_DEFINES} ${WIX_OUT_FILES}
WORKING_DIRECTORY ${_wix_binary_dir}
)
set_target_properties(wix_package PROPERTIES FOLDER "Packaging")
set_target_properties(wix_package PROPERTIES
FOLDER "Packaging"
EXCLUDE_FROM_DEFAULT_BUILD True
)
else()
message(WARNING "The WiX installer cannot be built if the Wireshark program isn't built.")
endif()