OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmake: empty MEU_OPENSSL param is now the same as not defined 

For convenience, let users pass the location of their MEU_OPENSSL tool
even when they don't use it. Silence the corresponding warning.

See https://cmake.org/pipermail/cmake/2011-February/042933.html for the
rationale.

Note this may fail if you install openssl in a relative directory called
"FALSE". Don't do that.

Signed-off-by: Marc Herbert <marc.herbert@intel.com>
This commit is contained in:
Marc Herbert 2020-09-17 19:40:32 +00:00 committed by Liam Girdwood
parent 9956f6bb55
commit dfd2336bb2
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/arch/xtensa/CMakeLists.txt
View File

@ -368,6 +368,13 @@ if(NOT DEFINED RIMAGE_IMR_TYPE)
set(RIMAGE_IMR_TYPE 3)
endif()
if(NOT MEU_OPENSSL)
set(MEU_OPENSSL "/usr/bin/openssl")
endif()
# Don't ask users to keep secret their openssl location depending on
# what they build in the moment.
set(silenceUnusedWarning "${MEU_OPENSSL}")
if(MEU_PATH OR DEFINED MEU_NO_SIGN)
if(NOT DEFINED MEU_OFFSET)
execute_process(
@ -410,10 +417,6 @@ if(MEU_PATH OR DEFINED MEU_NO_SIGN)
add_dependencies(run_rimage run_smex)
endif()
if(NOT DEFINED MEU_OPENSSL)
set(MEU_OPENSSL "/usr/bin/openssl")
endif()
if(NOT DEFINED MEU_FLAGS)
set(MEU_FLAGS
-f ${MEU_PATH}/generic_meu_conf.xml