From 3a9ac7d4acf76a39225dd5400c52336831ead200 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Tue, 12 Jan 2016 15:17:44 -0800 Subject: [PATCH] remove macro to consolidate installer components --- .../ConsolidateInstallerComponents.cmake | 33 ------------------- interface/CMakeLists.txt | 1 - 2 files changed, 34 deletions(-) delete mode 100644 cmake/macros/ConsolidateInstallerComponents.cmake diff --git a/cmake/macros/ConsolidateInstallerComponents.cmake b/cmake/macros/ConsolidateInstallerComponents.cmake deleted file mode 100644 index ea60fb599a..0000000000 --- a/cmake/macros/ConsolidateInstallerComponents.cmake +++ /dev/null @@ -1,33 +0,0 @@ -macro(CONSOLIDATE_INSTALLER_COMPONENTS) - - if (DEPLOY_PACKAGE AND WIN32) - # Copy icon files for interface and stack manager - if (TARGET_NAME STREQUAL "interface") - set (ICON_FILE_PATH "${PROJECT_SOURCE_DIR}/icon/${INTERFACE_ICON}") - set (ICON_DESTINATION_NAME "interface.ico") - - add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME} - COMMAND "${CMAKE_COMMAND}" -E copy_directory $ ${CMAKE_BINARY_DIR}/package-bundle - ) - elseif (TARGET_NAME STREQUAL "package-console") - set (ICON_FILE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/resources/${CONSOLE_ICON}") - set (ICON_DESTINATION_NAME "console.ico") - - # add a command to copy the folder produced by electron-packager to package-bundle - add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy ${ICON_FILE_PATH} ${CMAKE_BINARY_DIR}/package-bundle/${ICON_DESTINATION_NAME} - COMMAND "${CMAKE_COMMAND}" -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/${PACKAGED_CONSOLE_FOLDER} ${CMAKE_BINARY_DIR}/package-bundle - ) - else () - # add a command to copy the fixed up binary and libraries to package-bundle - add_custom_command( - TARGET ${TARGET_NAME} POST_BUILD - COMMAND "${CMAKE_COMMAND}" -E copy_directory $ ${CMAKE_BINARY_DIR}/package-bundle - ) - endif () - endif () - -endmacro() diff --git a/interface/CMakeLists.txt b/interface/CMakeLists.txt index 33b7777042..4248aa745d 100644 --- a/interface/CMakeLists.txt +++ b/interface/CMakeLists.txt @@ -267,4 +267,3 @@ if (WIN32) endif() package_libraries_for_deployment() -consolidate_installer_components()