From 828fa7d14de643b35aba2e284daf3e81ed0beff4 Mon Sep 17 00:00:00 2001 From: Jason Dellaluce Date: Mon, 10 Jul 2023 16:34:07 +0000 Subject: [PATCH] update(cmake): fix wasm package content Signed-off-by: Jason Dellaluce Co-authored-by: Rohith Raju --- cmake/modules/CPackConfig.cmake | 4 +--- cmake/modules/rules.cmake | 2 ++ userspace/falco/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/modules/CPackConfig.cmake b/cmake/modules/CPackConfig.cmake index defdcfc9..07a3de12 100644 --- a/cmake/modules/CPackConfig.cmake +++ b/cmake/modules/CPackConfig.cmake @@ -23,9 +23,7 @@ set(CPACK_PACKAGE_VERSION_PATCH "${FALCO_VERSION_PATCH}") set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CMAKE_SYSTEM_PROCESSOR}") set(CPACK_PROJECT_CONFIG_FILE "${PROJECT_SOURCE_DIR}/cmake/cpack/CMakeCPackOptions.cmake") set(CPACK_PACKAGE_RELOCATABLE "OFF") -if (NOT EMSCRIPTEN) - set(CPACK_STRIP_FILES "ON") -endif() +set(CPACK_STRIP_FILES "ON") # Built packages will include only the following components set(CPACK_INSTALL_CMAKE_PROJECTS diff --git a/cmake/modules/rules.cmake b/cmake/modules/rules.cmake index a04adc0b..80e1dbc3 100644 --- a/cmake/modules/rules.cmake +++ b/cmake/modules/rules.cmake @@ -36,6 +36,8 @@ if(NOT DEFINED FALCO_ETC_DIR) set(FALCO_ETC_DIR "${CMAKE_INSTALL_FULL_SYSCONFDIR}/falco") endif() +message(STATUS "EHHEHEHEHEHE ${CMAKE_INSTALL_FULL_SYSCONFDIR}, ${FALCO_ETC_DIR}") + if(NOT DEFINED FALCO_RULES_DEST_FILENAME) set(FALCO_RULES_DEST_FILENAME "falco_rules.yaml") set(FALCO_LOCAL_RULES_DEST_FILENAME "falco_rules.local.yaml") diff --git a/userspace/falco/CMakeLists.txt b/userspace/falco/CMakeLists.txt index c22bc9dc..85e8598a 100644 --- a/userspace/falco/CMakeLists.txt +++ b/userspace/falco/CMakeLists.txt @@ -219,6 +219,6 @@ else() install(FILES "$/falco.js" "$/falco.wasm" - DESTINATION / + DESTINATION ${FALCO_BIN_DIR} COMPONENT "${FALCO_COMPONENT_NAME}") endif()