Inlcude own libraries fixed
This commit is contained in:
parent
b5ff77cc41
commit
b85e479c47
|
|
@ -1,4 +1,4 @@
|
||||||
cmake_minimum_required(VERSION 3.10)
|
cmake_minimum_required(VERSION 2.8)
|
||||||
project(pingpong)
|
project(pingpong)
|
||||||
|
|
||||||
set(INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
|
set(INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
|
||||||
|
|
@ -9,10 +9,12 @@ execute_process(
|
||||||
COMMAND mkdir -p /usr/include/pingpong/
|
COMMAND mkdir -p /usr/include/pingpong/
|
||||||
)
|
)
|
||||||
|
|
||||||
|
include_directories(${INCLUDE_DIR})
|
||||||
|
|
||||||
set(INCLUDE_FILES
|
set(INCLUDE_FILES
|
||||||
${INCLUDE_DIR}/pipe.h
|
${INCLUDE_DIR}/socket
|
||||||
${INCLUDE_DIR}/socket.h
|
${INCLUDE_DIR}/pipe
|
||||||
${INCLUDE_DIR}/utils.h
|
${INCLUDE_DIR}/utils
|
||||||
)
|
)
|
||||||
|
|
||||||
set(SOURCE_FILES
|
set(SOURCE_FILES
|
||||||
|
|
@ -21,12 +23,6 @@ set(SOURCE_FILES
|
||||||
${SRC_DIR}/utils.c
|
${SRC_DIR}/utils.c
|
||||||
)
|
)
|
||||||
|
|
||||||
set(INSTALL_DIR /usr/include/pingpong/)
|
|
||||||
|
|
||||||
install(FILES ${INCLUDE_FILES} DESTINATION ${INSTALL_DIR})
|
|
||||||
|
|
||||||
include_directories(${CMAKE_SOURCE_DIR}/include)
|
|
||||||
|
|
||||||
set(CMAKE_CXX_STANDARD 11)
|
set(CMAKE_CXX_STANDARD 11)
|
||||||
|
|
||||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra")
|
||||||
|
|
@ -35,3 +31,6 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -march=native")
|
||||||
|
|
||||||
add_executable(./bin/server ${SOURCE_FILES} ./src/main_server.c)
|
add_executable(./bin/server ${SOURCE_FILES} ./src/main_server.c)
|
||||||
add_executable(./bin/client ${SOURCE_FILES} ./src/main_client.c)
|
add_executable(./bin/client ${SOURCE_FILES} ./src/main_client.c)
|
||||||
|
|
||||||
|
target_include_directories(./bin/server PUBLIC ${INCLUDE_DIR})
|
||||||
|
target_include_directories(./bin/client PUBLIC ${INCLUDE_DIR})
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#include <pingpong/socket.h>
|
#include <socket.h>
|
||||||
#include <pingpong/pipe.h>
|
#include <pipe.h>
|
||||||
#include <pingpong/utils.h>
|
#include <utils.h>
|
||||||
|
|
||||||
#define N 10000
|
#define N 10000
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#include <pingpong/socket.h>
|
#include <socket.h>
|
||||||
#include <pingpong/pipe.h>
|
#include <pipe.h>
|
||||||
#include <pingpong/utils.h>
|
#include <utils.h>
|
||||||
|
|
||||||
int num_of_read_bytes = 0;
|
int num_of_read_bytes = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
#include <pingpong/pipe.h>
|
#include <pipe.h>
|
||||||
#include <pingpong/utils.h>
|
#include <utils.h>
|
||||||
|
|
||||||
|
|
||||||
int *create_pipe()
|
int *create_pipe()
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,8 @@
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
|
||||||
#include <pingpong/socket.h>
|
#include <socket.h>
|
||||||
#include <pingpong/utils.h>
|
#include <utils.h>
|
||||||
|
|
||||||
int create_socket(int sin_family, int sock)
|
int create_socket(int sin_family, int sock)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include <pingpong/utils.h>
|
#include <utils.h>
|
||||||
|
|
||||||
void panic(char* message)
|
void panic(char* message)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue