From 05742f29b3c9829f8eb6c6485ad7379492903379 Mon Sep 17 00:00:00 2001 From: "Eduardo P. Gomez" Date: Thu, 21 Sep 2023 05:05:50 -0300 Subject: [PATCH] Fixed .deb executable bit --- CMakeLists.txt | 10 +++++----- CONTRIBUTING.md | 2 +- pack.sh | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c302751c..3e04ede9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ project(OpenDX) set(PROJECT_SOURCE_DIR "${CMAKE_SOURCE_DIR}") #Package -set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/root) +set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/opendx) set(CPACK_GENERATOR "DEB") set(CPACK_PACKAGE_NAME "opendx") set(CPACK_PACKAGE_VERSION "1.0.0") @@ -22,7 +22,10 @@ set(CPACK_PACKAGE_CONTACT "Eduardo P. Gomez ") set(CPACK_DEBIAN_PACKAGE_DEPENDS "libgtk-4-1") include(CPack) -install(DIRECTORY ${CMAKE_BINARY_DIR}/root/ DESTINATION /) +install(DIRECTORY ${CMAKE_BINARY_DIR}/opendx/bin DESTINATION /usr/bin FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) +install(DIRECTORY ${CMAKE_BINARY_DIR}/opendx/lib DESTINATION /usr/lib FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ WORLD_READ) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/opendx/bin") +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/opendx/lib") #C/C++ flags set(CMAKE_C_STANDARD 23) @@ -49,9 +52,6 @@ find_package_handle_standard_args( DEFAULT_MSG _LIBRARY _INCLUDE_DIR) mark_as_advanced(_INCLUDE_DIR _LIBRARY ) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/root/usr/bin") -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/root/usr/lib") - #base include include_directories(./include) configure_file(include/config.hpp.in ../include/config.hpp) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e068eaba..62664c47 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ These are the same universal steps for cmake: **Run:** ```sh #setups the terminal for better running. -PATH=$PATH:./build/root/usr/bin +PATH=$PATH:./build/opendx/bin #commands available to run: dxdiag diff --git a/pack.sh b/pack.sh index 294da71e..422c46a6 100755 --- a/pack.sh +++ b/pack.sh @@ -1,4 +1,4 @@ -tar -cvf opendx.tar -C build/root . +tar -cvf opendx.tar -C build opendx cd build cpack cd ..