Skip to content

Restore original build names. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gshep merged 1 commit into from
Nov 14, 2019
Merged

Restore original build names. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Configurations/10-main.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1308,7 +1308,7 @@ my %targets = (
bn_asm_src => sub { return undef unless @_;
my $r=join(" ",@_); $r=~s|asm/x86_64-gcc|bn_asm|; $r; },
perlasm_scheme => "auto",
multilib => "",
multilib => "-x64",
},
"VC-WIN32" => {
inherit_from => [ "VC-noCE-common", asm("x86_asm"),
Expand Down
26 changes: 24 additions & 2 deletions cmake/package.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,22 @@ if(NOT TARGET OpenSSL::crypto)
IMPORTED
)
if(MSVC)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(
OPENSSL_SUFFIX
"-x64"
)
else()
set(
OPENSSL_SUFFIX
""
)
endif()
set_target_properties(
OpenSSL::crypto
PROPERTIES
IMPORTED_LOCATION
${CMAKE_CURRENT_LIST_DIR}/bin/libcrypto-1_1.dll
${CMAKE_CURRENT_LIST_DIR}/bin/libcrypto-1_1${OPENSSL_SUFFIX}.dll
IMPORTED_IMPLIB
${CMAKE_CURRENT_LIST_DIR}/lib/libcrypto.lib
INTERFACE_INCLUDE_DIRECTORIES
Expand All @@ -45,11 +56,22 @@ if(NOT TARGET OpenSSL::ssl)
IMPORTED
)
if(MSVC)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(
OPENSSL_SUFFIX
"-x64"
)
else()
set(
OPENSSL_SUFFIX
""
)
endif()
set_target_properties(
OpenSSL::ssl
PROPERTIES
IMPORTED_LOCATION
${CMAKE_CURRENT_LIST_DIR}/bin/libssl-1_1.dll
${CMAKE_CURRENT_LIST_DIR}/bin/libssl-1_1${OPENSSL_SUFFIX}.dll
IMPORTED_IMPLIB
${CMAKE_CURRENT_LIST_DIR}/lib/libssl.lib
INTERFACE_INCLUDE_DIRECTORIES
Expand Down