Commit 35d7dec
authored
Cherry-pick #3225 onto the FIPS 2025 branch.
------
### Description of changes:
CMake classifies DLL files as `RUNTIME` artifacts, not `LIBRARY`
artifacts. Our install rules only specified `LIBRARY DESTINATION` and
`ARCHIVE DESTINATION`, so `cmake --install` was silently skipping the
DLL files on Windows. This adds `RUNTIME DESTINATION
${CMAKE_INSTALL_BINDIR}` to the install rules for both `crypto` and
`ssl`. On non-Windows platforms the clause is harmlessly ignored since
`.so`/`.dylib` are `LIBRARY` type.
### Testing:
Added a `build_and_install` step to `run_windows_tests.bat` that builds
with `BUILD_SHARED_LIBS=1`, runs `cmake --install`, and asserts that
`crypto.dll` and `ssl.dll` are present in the install prefix's `bin/`
directory.
By submitting this pull request, I confirm that my contribution is made
under the terms of the Apache 2.0 license and the ISC license.
1 parent 8bc6825 commit 35d7dec
3 files changed
Lines changed: 40 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
939 | 939 | | |
940 | 940 | | |
941 | 941 | | |
942 | | - | |
| 942 | + | |
| 943 | + | |
943 | 944 | | |
944 | 945 | | |
945 | 946 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| 121 | + | |
121 | 122 | | |
122 | 123 | | |
123 | 124 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
38 | 41 | | |
39 | 42 | | |
40 | 43 | | |
| |||
105 | 108 | | |
106 | 109 | | |
107 | 110 | | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
0 commit comments