rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix up OpenSSL paths in CMake and WiX

This commit is contained in:
Andrew Nelless 2017-01-03 23:39:19 +00:00
parent d95b39bb70
commit e86029d7ea
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
CMakeLists.txt
View File

@ -324,32 +324,24 @@ endif()
if (WIN32) if (WIN32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(OPENSSL_PLAT_DIR openssl-win64) set(OPENSSL_ARCH_DIR win64)
else() else()
set(OPENSSL_PLAT_DIR openssl-win32) set(OPENSSL_ARCH_DIR win32)
endif() endif()
set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/inc32) set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/include)
endif()
if (APPLE)
set(OPENSSL_PLAT_DIR openssl-osx)
set(OPENSSL_ARCH_DIR x86_64)
set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/${OPENSSL_ARCH_DIR}/include)
endif()
if (WIN32)
set(OPENSSL_LIBS set(OPENSSL_LIBS
${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/libeay32.lib ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/lib/libeay32.lib
${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/out32dll/ssleay32.lib ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/${OPENSSL_ARCH_DIR}/lib/ssleay32.lib
) )
endif() endif()
if (UNIX) if (UNIX)
if (APPLE) if (APPLE)
set(OPENSSL_INCLUDE ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/osx/include)
set(OPENSSL_ARCH_DIR x86_64) set(OPENSSL_ARCH_DIR x86_64)
set(OPENSSL_LIBS set(OPENSSL_LIBS
${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/${OPENSSL_ARCH_DIR}/libssl.a ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/osx/${OPENSSL_ARCH_DIR}/libssl.a
${CMAKE_CURRENT_SOURCE_DIR}/ext/${OPENSSL_PLAT_DIR}/${OPENSSL_ARCH_DIR}/libcrypto.a ${CMAKE_CURRENT_SOURCE_DIR}/ext/openssl/osx/${OPENSSL_ARCH_DIR}/libcrypto.a
) )
else() else()
set(OPENSSL_LIBS ssl crypto) set(OPENSSL_LIBS ssl crypto)

4
src/setup/win32/Include.wxi
View File

@ -19,14 +19,14 @@
<?define ProgramFilesFolder="ProgramFiles64Folder" ?> <?define ProgramFilesFolder="ProgramFiles64Folder" ?>
<?define PlatformSimpleName="64-bit" ?> <?define PlatformSimpleName="64-bit" ?>
<?define UpgradeGuid="$(var.UpgradeGuid64)" ?> <?define UpgradeGuid="$(var.UpgradeGuid64)" ?>
<?define var.OpensslPath="openssl-win64" ?> <?define var.OpensslPath="openssl/win64" ?>
<?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?> <?define var.QtPath="C:\Qt\5.6\msvc2015_64\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?> <?define QtPlatformPath="C:\Qt\5.6\msvc2015_64\plugins\platforms" ?>
<?else?> <?else?>
<?define ProgramFilesFolder="ProgramFilesFolder" ?> <?define ProgramFilesFolder="ProgramFilesFolder" ?>
<?define PlatformSimpleName="32-bit" ?> <?define PlatformSimpleName="32-bit" ?>
<?define UpgradeGuid="$(var.UpgradeGuid32)" ?> <?define UpgradeGuid="$(var.UpgradeGuid32)" ?>
<?define var.OpensslPath="openssl-win32" ?> <?define var.OpensslPath="openssl/win32" ?>
<?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?> <?define var.QtPath="C:\Qt\5.6\msvc2015\bin" ?>
<?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?> <?define QtPlatformPath="C:\Qt\5.6\msvc2015\plugins\platforms" ?>
<?endif?> <?endif?>

6
src/setup/win32/Product.wxs
View File

@ -152,9 +152,9 @@
<ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir"> <ComponentGroup Id="OpenSslComponents" Directory="OpenSslDir">
<Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1"> <Component Id="OpenSsl" Guid="92648F77-65A6-4B16-AC59-A1F37BD341B1">
<File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/libeay32.dll" Id="OpenSslDll1" /> <File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/libeay32.dll" Id="OpenSslDll1" />
<File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/ssleay32.dll" Id="OpenSslDll2" /> <File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/ssleay32.dll" Id="OpenSslDll2" />
<File Source="$(var.ExtPath)/$(var.OpensslPath)/out32dll/openssl.exe" /> <File Source="$(var.ExtPath)/$(var.OpensslPath)/bin/openssl.exe" />
<File Source="$(var.ResPath)/openssl/synergy.conf" /> <File Source="$(var.ResPath)/openssl/synergy.conf" />
</Component> </Component>
</ComponentGroup> </ComponentGroup>