Merge pull request #10 from openappsec/Jan_22_2023-Dev

Fix installation issues
This commit is contained in:
WrightNed 2023-01-22 20:30:56 +02:00 committed by GitHub
commit f7934cd09d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 13 deletions

View File

@ -2,12 +2,5 @@ add_executable(cpnano_base64 cpnano_base64.cc base64.cc)
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${GCC_COMPILE_FLAGS}")
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${GCC_LINK_FLAGS}")
add_custom_command(TARGET cpnano_base64
POST_BUILD
COMMAND strip $<TARGET_FILE:cpnano_base64> -o $<TARGET_FILE:cpnano_base64>.strip
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cpnano_base64>.strip ${CMAKE_INSTALL_PREFIX}/bin/$<TARGET_FILE:cpnano_json>.strip
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cpnano_base64>.strip ${CMAKE_INSTALL_PREFIX}/orchestration/$<TARGET_FILE:cpnano_json>
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:cpnano_base64>.strip ${CMAKE_INSTALL_PREFIX}/wlp_standalone/$<TARGET_FILE:cpnano_json>
)
install(TARGETS cpnano_base64 DESTINATION bin/)
install(TARGETS cpnano_base64 DESTINATION orchestration/)

View File

@ -1,5 +1 @@
file(
DOWNLOAD
https://github.com/mikefarah/yq/releases/download/v4.26.1/yq_linux_amd64
${CMAKE_INSTALL_PREFIX}/orchestration/scripts/yq
)
install(FILES yq_linux_amd64 DESTINATION orchestration/scripts RENAME yq PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)