Recover windows installer cmake file. #44
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Yury-Fridlyand <yury.fridlyand@improving.com>
Yury-Fridlyand
requested review from
pjfitzgibbons,
ps48,
kavithacm,
derek-ho,
joshuali925,
dai-chen,
YANG-DB,
rupal-bq,
mengweieric,
vamsi-amazon,
Swiddis,
penghuo,
seankao-az,
MaxKsyunz and
anirudha
as code owners
MaxKsyunz
approved these changes
Jun 1, 2023
forestmvey
approved these changes
Jun 1, 2023
matthewryanwells
approved these changes
Jun 1, 2023
acarbonetto
approved these changes
Jun 2, 2023
| set(AWS_SDK_BIN_DIR "${PROJECT_ROOT}/src/vcpkg_installed/x${BITNESS}-windows/bin") | ||
| install(DIRECTORY ${AWS_SDK_BIN_DIR} DESTINATION . COMPONENT "Driver" FILES_MATCHING PATTERN "*.dll") | ||
|
|
||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") |
There was a problem hiding this comment.
is this input parameter by the user? Should we check case-insensitive?
There was a problem hiding this comment.
Maybe. I just recovered deleted piece of file. The only thing I added is FILES_MATCHING PATTERN "*.dll" to exclude big pdb files (debug symbols).
|
|
||
| if(CMAKE_BUILD_TYPE STREQUAL "Debug") | ||
| # We actually never build the installer for Debug | ||
| install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/Debug/libcurl-d.dll" DESTINATION bin COMPONENT "Driver") |
There was a problem hiding this comment.
Might be easier to read if you just include CMAKE_BUILD_TYPE as part of the string, like:
install(FILES "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/" CMAKE_BUILD_TYPE "/libcurl-d.dll" DESTINATION bin COMPONENT "Driver")
There was a problem hiding this comment.
File name of libcurl changes between release and debug
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Partially revert changes from #27.
New installer content:
Tested on Windows 32/64 bit and Mac.
Issues Resolved
Fixes #43
Check List
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.