Skip to content

Commit 9ee3490

Browse files
committed
fix installer
1 parent 8c2d43d commit 9ee3490

File tree

5 files changed

+14
-3
lines changed

5 files changed

+14
-3
lines changed

cmake/RuntimeDependencies.cmake

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,15 @@ if(OPTION_SELF_CONTAINED)
1616
# Install 3rd-party runtime dependencies into runtime-component
1717
# install(FILES ... COMPONENT runtime)
1818

19+
find_file(DLLS_CPPASSIST cppassist.dll)
20+
21+
set(DLLS
22+
${DLLS_CPPASSIST}
23+
)
24+
set(PLATFORMS
25+
${DLLS_WIN}
26+
)
27+
install(FILES ${DLLS} DESTINATION ${INSTALL_BIN} COMPONENT examples)
28+
install(FILES ${PLATFORMS} DESTINATION ${INSTALL_BIN}/platforms COMPONENT examples)
29+
1930
endif()

deploy/images/logo.bmp

-25.2 KB
Binary file not shown.

deploy/images/logo.ico

-12.6 KB
Binary file not shown.

deploy/images/logo.png

-9.96 KB
Binary file not shown.

deploy/packages/pack-cppfs.cmake

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
130130
set(CPACK_RESOURCE_FILE_README "${PROJECT_SOURCE_DIR}/README.md")
131131
set(CPACK_RESOURCE_FILE_WELCOME "${PROJECT_SOURCE_DIR}/README.md")
132132
set(CPACK_PACKAGE_DESCRIPTION_FILE "${PROJECT_SOURCE_DIR}/README.md")
133-
set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.bmp")
133+
#set(CPACK_PACKAGE_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.bmp")
134134
set(CPACK_PACKAGE_FILE_NAME "${package_name}-${CPACK_PACKAGE_VERSION}")
135135
set(CPACK_PACKAGE_INSTALL_DIRECTORY "${package_name}")
136136
set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY "${package_name}")
@@ -163,8 +163,8 @@ endif()
163163

164164
# Package options
165165
#set(CPACK_NSIS_DISPLAY_NAME "${package_name}-${META_VERSION}")
166-
set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
167-
set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
166+
#set(CPACK_NSIS_MUI_ICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
167+
#set(CPACK_NSIS_MUI_UNIICON "${PROJECT_SOURCE_DIR}/deploy/images/logo.ico")
168168

169169
# Optional Preliminaries (i.e., silent Visual Studio Redistributable install)
170170
if(NOT INSTALL_MSVC_REDIST_FILEPATH)

0 commit comments

Comments
 (0)