github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-19 21:13:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix CLI for FreeBSD

Browse source
This commit is contained in:
Florian Märkl 2019-08-25 16:38:14 +02:00
commit 6321f669cb
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
5 changed files with 29 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -7,6 +7,7 @@ option(CHIAKI_ENABLE_TESTS "Enable tests for Chiaki" ON)
option(CHIAKI_ENABLE_CLI "Enable CLI for Chiaki" OFF)
option(CHIAKI_GUI_ENABLE_QT_GAMEPAD "Use QtGamepad for Input" OFF)
option(CHIAKI_GUI_ENABLE_SDL_GAMECONTROLLER "Use SDL Gamecontroller for Input" ON)
option(CHIAKI_CLI_ARGP_STANDALONE "Search for standalone argp lib for CLI" OFF)
set(CHIAKI_VERSION_MAJOR 1)
set(CHIAKI_VERSION_MINOR 0)

5
cli/CMakeLists.txt
View file

@ -7,5 +7,10 @@ add_library(chiaki-cli-lib STATIC ${SOURCE})
target_include_directories(chiaki-cli-lib PUBLIC "include")
target_link_libraries(chiaki-cli-lib chiaki-lib)
if(CHIAKI_CLI_ARGP_STANDALONE)
find_package(Argp REQUIRED)
target_link_libraries(chiaki-cli-lib Argp::Argp)
endif()
add_executable(chiaki-cli src/main.c)
target_link_libraries(chiaki-cli chiaki-cli-lib)

3
cli/src/discover.c
View file

@ -24,6 +24,7 @@
#include <netdb.h>
#include <stdio.h>
#include <string.h>
#include <netinet/in.h>
static char doc[] = "Send a PS4 discovery request.";
@ -168,4 +169,4 @@ CHIAKI_EXPORT int chiaki_cli_cmd_discover(ChiakiLog *log, int argc, char *argv[]
sleep(1);
return 0;
}
}

20
cmake/FindArgp.cmake Normal file
View file

@ -0,0 +1,20 @@
# FindArgp
# Will define Target Argp::Argp
find_path(Argp_INCLUDE_DIR
NAMES argp.h)
find_library(Argp_LIBRARY
NAMES argp)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Argp
REQUIRED_VARS Argp_LIBRARY Argp_INCLUDE_DIR)
if(Argp_FOUND AND NOT TARGET Argp::Argp)
add_library(Argp::Argp UNKNOWN IMPORTED)
set_target_properties(Argp::Argp PROPERTIES
IMPORTED_LOCATION "${Argp_LIBRARY}"
INTERFACE_INCLUDE_DIRECTORIES "${Argp_INCLUDE_DIR}")
endif()

2
gui/CMakeLists.txt
View file

@ -70,7 +70,7 @@ target_include_directories(chiaki PRIVATE include)
target_link_libraries(chiaki chiaki-lib)
if(CHIAKI_ENABLE_CLI)
add_definitions(CHIAKI_ENABLE_CLI)
add_definitions(-DCHIAKI_ENABLE_CLI)
target_link_libraries(chiaki chiaki-cli-lib)
endif()