From bdbf37c55b6075b63795cedbd71ce5612d38ceb9 Mon Sep 17 00:00:00 2001 From: CLARATION Date: Fri, 11 Sep 2026 00:54:54 -0700 Subject: [PATCH] fix(build): use correct directory for packaging --- Makefile | 2 +- cmake/BuildInstall.cmake | 1 + src/{udevhelper.c => udev_helper.c} | 2 +- src/{udevhelper.h => udev_helper.h} | 6 +++--- src/wx/AppFrame.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) rename src/{udevhelper.c => udev_helper.c} (98%) rename src/{udevhelper.h => udev_helper.h} (94%) diff --git a/Makefile b/Makefile index 82ba955..2a8f31a 100644 --- a/Makefile +++ b/Makefile @@ -61,7 +61,7 @@ ifeq ($(PLATFORM),iphoneos) @codesign --force --sign - --entitlements resources/entitlements.xml build/Debug-iphoneos/palera1n.app/palera1n endif -package: build +package: palera1n cpack --config build/CPackConfig.cmake -C $(BUILD_TYPE) clean: diff --git a/cmake/BuildInstall.cmake b/cmake/BuildInstall.cmake index d8d9faa..8706884 100644 --- a/cmake/BuildInstall.cmake +++ b/cmake/BuildInstall.cmake @@ -106,5 +106,6 @@ else() set(CPACK_GENERATOR "TGZ") endif() endif() +set(CPACK_PACKAGE_DIRECTORY "${CMAKE_BINARY_DIR}") include(CPack) diff --git a/src/udevhelper.c b/src/udev_helper.c similarity index 98% rename from src/udevhelper.c rename to src/udev_helper.c index 66b4844..6a2d800 100644 --- a/src/udevhelper.c +++ b/src/udev_helper.c @@ -27,7 +27,7 @@ #if defined(__linux__) -#include "udevhelper.h" +#include "udev_helper.h" #include #include diff --git a/src/udevhelper.h b/src/udev_helper.h similarity index 94% rename from src/udevhelper.h rename to src/udev_helper.h index 3168984..8be96da 100644 --- a/src/udevhelper.h +++ b/src/udev_helper.h @@ -25,8 +25,8 @@ * */ -#ifndef P1__UDEVHELPER_H -#define P1__GLOBALS_H +#ifndef P1__UDEV_HELPER_H +#define P1__UDEV_HELPER_H #if defined(__linux__) @@ -45,4 +45,4 @@ int add_udev_rules(void); #endif // defined(__linux__) -#endif // P1__GLOBALS_H +#endif // P1__UDEV_HELPER_H diff --git a/src/wx/AppFrame.cpp b/src/wx/AppFrame.cpp index 18b558c..29af571 100644 --- a/src/wx/AppFrame.cpp +++ b/src/wx/AppFrame.cpp @@ -32,7 +32,7 @@ #include #include "../globals.h" #if defined(WITH_GUI) && defined(__linux__) -# include "../udevhelper.h" +# include "../udev_helper.h" #endif #include "../events/event.hpp"