Skip to content

Fix cmake warning #25

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

Merged
scizen9 merged 4 commits into from
Jul 31, 2024
Merged

Fix cmake warning #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
114449d
remove c17 flags
mikelangmayr Jul 31, 2024
098c293
set default port in sendcmd to remove cmake warning
mikelangmayr Jul 31, 2024
4185417
comment out expose test command
mikelangmayr Jul 31, 2024
8a76771
set workflow branch back to master
mikelangmayr Jul 31, 2024
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
4 changes: 2 additions & 2 deletions .github/workflows/cmake-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,8 @@ jobs:
# command_exptime=$(cam exptime 1500)
# check $command_exptime

command_expose=$(cam expose)
check $command_expose
# command_expose=$(cam expose)
# check $command_expose

command_printstatus=$(cam printstatus)
check $command_printstatus
Expand Down
2 changes: 1 addition & 1 deletion emulator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ include_directories( ${PROJECT_BASE_DIR}/utils
${PROJECT_BASE_DIR}/camerad
${PROJECT_BASE_DIR}/common )

add_definitions( -Wall -ansi -O2 -Wno-variadic-macros -std=c++17 -std=c17 -ggdb )
add_definitions( -Wall -ansi -O2 -Wno-variadic-macros -std=c++17 -ggdb )

if( ${INTERFACE_TYPE} STREQUAL "Archon" )
add_definitions(-DSTA_ARCHON)
Expand Down
2 changes: 1 addition & 1 deletion utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(PROJECT_UTILS_DIR ${PROJECT_BASE_DIR}/utils)

set( CMAKE_CXX_STANDARD 17 )

add_definitions( -Wall -ansi -O1 -Wno-variadic-macros -std=c++17 -std=c17 -ggdb )
add_definitions( -Wall -ansi -O1 -Wno-variadic-macros -std=c++17 -ggdb )

add_library(utilities STATIC
${PROJECT_UTILS_DIR}/utilities.cpp
Expand Down
11 changes: 5 additions & 6 deletions utils/sendcmd.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,19 @@

int main(int argc, char *argv[])
{
int sock, timeout;
int sock, timeout=10;
struct timeval tvstart, tvend;
int bufsize = 8192;
int nread, len;
char *message = (char*)malloc(bufsize);
char *response = (char*)malloc(bufsize);
char *hostname = (char*)malloc (30);
int i, port, mode;
struct sockaddr_in address;
struct hostent *host_struct;
struct hostent *host_struct;
int mode = 0; /* 0: wait, 1: not wait*/

mode = 0; /* 0: wait, 1: not wait*/
timeout = 10;
i = 1;
int port = 3031; // set default port
int i = 1;
if (argc > 1)
while (i < argc) {
if (argv[i][0] == '-') {
Expand Down