Skip to content

Commit ea455e0

Browse files
committed
Moved installer based resources from [SOURCE_CODE_DIR]\resources to map directly to [SOURCE_CODE_DIR]\resources\installer.
1 parent 120ed4f commit ea455e0

File tree

5 files changed

+5
-5
lines changed

5 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -373,8 +373,8 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/shellanything-config-version.cma
373373
configure_file(${CMAKE_SOURCE_DIR}/cmake/shellanything-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cmake/shellanything-config.cmake @ONLY)
374374
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/shellanything-config.cmake DESTINATION ${SHELLANYTHING_INSTALL_CMAKE_DIR})
375375

376-
install(FILES ${CMAKE_SOURCE_DIR}/resources/register.bat
377-
${CMAKE_SOURCE_DIR}/resources/unregister.bat
376+
install(FILES ${CMAKE_SOURCE_DIR}/resources/installer/bin/register.bat
377+
${CMAKE_SOURCE_DIR}/resources/installer/bin/unregister.bat
378378
DESTINATION ${SHELLANYTHING_INSTALL_BIN_DIR})
379379

380380
# Resources
@@ -473,7 +473,7 @@ set(CPACK_PACKAGE_EXECUTABLES
473473
# This is intended behavior for ShellAnything.
474474
set(CPACK_WIX_UPGRADE_GUID "EBEF1698-CA72-480A-9FE3-E8A08E7E03ED") # as per v0.7.0 and older
475475

476-
set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/resources/wix_license_template.rtf")
476+
set(CPACK_WIX_LICENSE_RTF "${CMAKE_SOURCE_DIR}/resources/installer/wix_license_template.rtf")
477477
set(CPACK_WIX_PRODUCT_ICON "${CMAKE_SOURCE_DIR}/resources/icons/shellanything.ico")
478478
set(CPACK_WIX_HELP_LINK "https://github.com/end2endzone/ShellAnything")
479479
set(CPACK_WIX_PROGRAM_MENU_FOLDER "${PROJECT_NAME}")
File renamed without changes.

src/core/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,11 +120,11 @@ add_custom_command( TARGET sa.core POST_BUILD
120120
# Copy registration and unregistration scripts to target dir
121121
add_custom_command( TARGET sa.core POST_BUILD
122122
COMMAND ${CMAKE_COMMAND} -E copy_if_different
123-
${CMAKE_SOURCE_DIR}/resources/register.bat $<TARGET_FILE_DIR:sa.core>/register.bat
123+
${CMAKE_SOURCE_DIR}/resources/installer/bin/register.bat $<TARGET_FILE_DIR:sa.core>/register.bat
124124
COMMENT "Copying register.bat script.")
125125
add_custom_command( TARGET sa.core POST_BUILD
126126
COMMAND ${CMAKE_COMMAND} -E copy_if_different
127-
${CMAKE_SOURCE_DIR}/resources/unregister.bat $<TARGET_FILE_DIR:sa.core>/unregister.bat
127+
${CMAKE_SOURCE_DIR}/resources/installer/bin/unregister.bat $<TARGET_FILE_DIR:sa.core>/unregister.bat
128128
COMMENT "Copying unregister.bat script.")
129129

130130
# Copy files and other dependencies to target dir

0 commit comments

Comments
 (0)