valitydev/osquery-1
14
0
Fork 0
mirror of https://github.com/valitydev/osquery-1.git synced 2024-11-06 09:35:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CMake: Update the OpenSSL formula (#5976)

Browse Source
This commit is contained in:
Alessandro Gario 2019-11-02 02:25:14 +01:00 committed by Teddy Reed
parent 893dadf8bc
commit 7fee358178
4 changed files with 5 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
azure-pipelines.yml
View File

@ -334,7 +334,7 @@ jobs:
- powershell: |
tools\ci\scripts\install_openssl_formula_dependencies.ps1
displayName: "Installing: Strawberry Perl and NASM"
displayName: "Installing: Strawberry Perl"
workingDirectory: $(Build.SourcesDirectory)
- task: CMake@1

2
docs/wiki/development/building.md
View File

@ -88,7 +88,7 @@ Note: It may be easier to install these prerequisites using [Chocolatey](https:/
- [Python 2](https://www.python.org/downloads/windows/), specifically the 64-bit version.
- [Python 3](https://www.python.org/downloads/windows/), specifically the 64-bit version.
- [Wix Toolset](https://wixtoolset.org/releases/)
- [Strawberry Perl](http://strawberryperl.com/) and [NASM](https://nasm.us) for the OpenSSL formula. It is recommended to install them to their default destination folders.
- [Strawberry Perl](http://strawberryperl.com/) for the OpenSSL formula. It is recommended to install it to the default destination path.
**Step 2: Download and build**

22
libraries/cmake/formula/openssl/CMakeLists.txt
View File

@ -87,31 +87,15 @@ function(opensslMain)
)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
unset(perl_executable_path CACHE)
find_program(perl_executable_path "perl.exe"
PATHS "C:\\Strawberry\\perl\\bin"
)
if("${perl_executable_path}" STREQUAL "perl_executable_path-NOTFOUND")
message(FATAL_ERROR "The perl.exe executable could not be found. Please install Strawberry Perl")
endif()
unset(nasm_executable_path CACHE)
find_program(nasm_executable_path "nasm.exe"
PATHS "C:\\Program Files\\NASM"
)
if("${nasm_executable_path}" STREQUAL "nasm_executable_path-NOTFOUND")
message(FATAL_ERROR "The nasm.exe executable could not be found. Please install NASM")
endif()
find_package(Perl REQUIRED)
set(configure_command
"${CMAKE_COMMAND}" -E env
"${perl_executable_path}" Configure VC-WIN64A
"${PERL_EXECUTABLE}" Configure VC-WIN64A
${common_options}
)
get_filename_component(perl_bin_path "${perl_executable_path}" DIRECTORY)
get_filename_component(perl_bin_path "${PERL_EXECUTABLE}" DIRECTORY)
set(build_command
cmake -E env "PATH=${perl_bin_path}" "cmd.exe" "/C" "ms\\do_nt.bat" &&

7
tools/ci/scripts/install_openssl_formula_dependencies.ps1
View File

@ -13,10 +13,3 @@
# It does not seem that they have HTTPS: https://github.com/StrawberryPerl/strawberryperl.com/issues/11
Invoke-WebRequest "http://strawberryperl.com/download/5.30.0.1/strawberry-perl-5.30.0.1-64bit.zip" -OutFile "$env:TEMP\strawberry_perl.zip"
Expand-Archive "$env:TEMP\strawberry_perl.zip" -DestinationPath "C:\Strawberry" -Force
#
# Download and install the NASM assembler
#
Invoke-WebRequest "https://www.nasm.us/pub/nasm/releasebuilds/2.14.02/win64/nasm-2.14.02-installer-x64.exe" -OutFile "$env:TEMP\nasm_installer.exe"
Start-Process "$env:TEMP\nasm_installer.exe" -Wait -ArgumentList "/S", "/D=C:\Program Files\NASM"