diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a7fc55..005cc1e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,8 +61,8 @@ endif() #locate rjp library requirements if(ENABLE_RESTORE_FILE) - find_library(RJP_LIB rjp) - find_path(RJP_HEADER_DIR rjp.h) + find_package(PkgConfig REQUIRED) + pkg_check_modules(RJP REQUIRED rjp) #temporary library (no actual library generated) add_library(common_srcs OBJECT src/cmd.c src/common.c src/restore.c) add_definitions("-DENABLE_RESTORE_FILE") @@ -80,8 +80,9 @@ if(BUILD_REXLEDCTL) target_compile_definitions(rexledctl PRIVATE REXLEDCTL) #define REXLEDCTL in C files target_link_libraries(rexledctl PRIVATE $) #link with the common_srcs "library" if(ENABLE_RESTORE_FILE) - target_link_libraries(rexledctl PRIVATE "${RJP_LIB}") #link with rjp - target_include_directories(rexledctl PUBLIC "${RJP_HEADER_DIR}") #include rjp.h directory + target_link_libraries(rexledctl PRIVATE "${RJP_LIBRARIES}") #link with rjp + target_include_directories(rexledctl PUBLIC "${RJP_INCLUDE_DIRS}") #include rjp.h directory + target_compile_options(rexledctl PUBLIC ${RJP_CFLAGS_OTHER}) endif() install(TARGETS rexledctl RUNTIME DESTINATION bin) if(INSTALL_UDEV_LED_RULE) @@ -95,8 +96,9 @@ if(BUILD_REXBACKLIGHT) target_compile_definitions(rexbacklight PRIVATE REXBACKLIGHT) target_link_libraries(rexbacklight PRIVATE $) if(ENABLE_RESTORE_FILE) - target_link_libraries(rexbacklight PRIVATE "${RJP_LIB}") - target_include_directories(rexbacklight PUBLIC "${RJP_HEADER_DIR}") + target_link_libraries(rexbacklight PRIVATE "${RJP_LIBRARIES}") + target_include_directories(rexbacklight PUBLIC "${RJP_INCLUDE_DIRS}") + target_compile_options(rexbacklight PUBLIC ${RJP_CFLAGS_OTHER}) endif() install(TARGETS rexbacklight RUNTIME DESTINATION bin) if(INSTALL_UDEV_BACKLIGHT_RULE)