Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

👷 scx: use scx_loader to start/stop scheds #28

Merged
merged 1 commit into from
Nov 18, 2024
Merged

👷 scx: use scx_loader to start/stop scheds #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ include(CPM)
find_package(Python3 REQUIRED COMPONENTS Interpreter)
find_package(Threads REQUIRED)
find_package(PkgConfig REQUIRED)
find_package(Qt6 COMPONENTS Widgets LinguistTools Concurrent REQUIRED)
find_package(Qt6 COMPONENTS Widgets LinguistTools Concurrent DBus REQUIRED)
pkg_check_modules(
LIBALPM
REQUIRED
Expand Down Expand Up @@ -119,6 +119,7 @@ qt_add_executable(${PROJECT_NAME}
"${CMAKE_BINARY_DIR}/compile_options.hpp"
src/config-options.hpp src/config-options.cpp
src/conf-window.hpp src/conf-window.cpp
src/scx_utils.hpp src/scx_utils.cpp
src/schedext-window.hpp src/schedext-window.cpp
src/conf-patches-page.hpp src/conf-patches-page.ui
src/conf-options-page.hpp src/conf-options-page.ui
Expand All @@ -140,9 +141,9 @@ enable_sanitizers(project_options)
include_directories(${CMAKE_SOURCE_DIR}/src ${CMAKE_BINARY_DIR})

corrosion_import_crate(MANIFEST_PATH "config-option-lib/Cargo.toml" FLAGS "${CARGO_FLAGS}")
corrosion_add_cxxbridge(config-option-lib-cxxbridge CRATE config_option_lib MANIFEST_PATH "config-option-lib/Cargo.toml" FILES lib.rs)
corrosion_add_cxxbridge(config-option-lib-cxxbridge CRATE config_option_lib MANIFEST_PATH "config-option-lib/Cargo.toml" FILES lib.rs scx_loader_config.rs)

target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options Qt6::Widgets Qt6::Concurrent Threads::Threads fmt::fmt frozen::frozen config-option-lib-cxxbridge PkgConfig::LIBALPM PkgConfig::LIBGLIB)
target_link_libraries(${PROJECT_NAME} PRIVATE project_warnings project_options Qt6::Widgets Qt6::Concurrent Qt6::DBus Threads::Threads fmt::fmt frozen::frozen config-option-lib-cxxbridge PkgConfig::LIBALPM PkgConfig::LIBGLIB)

option(ENABLE_UNITY "Enable Unity builds of projects" OFF)
if(ENABLE_UNITY)
Expand Down
2 changes: 2 additions & 0 deletions config-option-lib/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
// with this program; if not, write to the Free Software Foundation, Inc.,
// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

pub mod scx_loader_config;

use std::fs;
use std::io::Write;

Expand Down
Loading
Loading