diff options
| -rw-r--r-- | packaging/nsis/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | packaging/portableapps/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | packaging/wix/CMakeLists.txt | 10 |
3 files changed, 28 insertions, 7 deletions
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt index 3d06369abc..ca71ec04d3 100644 --- a/packaging/nsis/CMakeLists.txt +++ b/packaging/nsis/CMakeLists.txt @@ -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 ) diff --git a/packaging/portableapps/CMakeLists.txt b/packaging/portableapps/CMakeLists.txt index b5c718fcf6..9d0a84770b 100644 --- a/packaging/portableapps/CMakeLists.txt +++ b/packaging/portableapps/CMakeLists.txt @@ -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( diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt index dd360e87ad..999cd54f1f 100644 --- a/packaging/wix/CMakeLists.txt +++ b/packaging/wix/CMakeLists.txt @@ -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() |