From b85e479c476c13f4403f3e5e229638333deed147 Mon Sep 17 00:00:00 2001 From: Vinicius Date: Wed, 20 Dec 2023 09:31:46 -0300 Subject: [PATCH] Inlcude own libraries fixed --- CMakeLists.txt | 19 +++++++++---------- src/main_client.c | 6 +++--- src/main_server.c | 6 +++--- src/pipe.c | 4 ++-- src/socket.c | 4 ++-- src/utils.c | 2 +- 6 files changed, 20 insertions(+), 21 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2cf953..33b049d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.10) +cmake_minimum_required(VERSION 2.8) project(pingpong) set(INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include) @@ -9,10 +9,12 @@ execute_process( COMMAND mkdir -p /usr/include/pingpong/ ) +include_directories(${INCLUDE_DIR}) + set(INCLUDE_FILES - ${INCLUDE_DIR}/pipe.h - ${INCLUDE_DIR}/socket.h - ${INCLUDE_DIR}/utils.h + ${INCLUDE_DIR}/socket + ${INCLUDE_DIR}/pipe + ${INCLUDE_DIR}/utils ) set(SOURCE_FILES @@ -21,12 +23,6 @@ set(SOURCE_FILES ${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_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/client ${SOURCE_FILES} ./src/main_client.c) + +target_include_directories(./bin/server PUBLIC ${INCLUDE_DIR}) +target_include_directories(./bin/client PUBLIC ${INCLUDE_DIR}) \ No newline at end of file diff --git a/src/main_client.c b/src/main_client.c index 22f681b..d3cf448 100644 --- a/src/main_client.c +++ b/src/main_client.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include #define N 10000 diff --git a/src/main_server.c b/src/main_server.c index b20e4f0..0b7845e 100644 --- a/src/main_server.c +++ b/src/main_server.c @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include int num_of_read_bytes = 0; diff --git a/src/pipe.c b/src/pipe.c index b57dc62..ff6ee07 100644 --- a/src/pipe.c +++ b/src/pipe.c @@ -1,8 +1,8 @@ #include #include -#include -#include +#include +#include int *create_pipe() diff --git a/src/socket.c b/src/socket.c index 22b5294..33babce 100644 --- a/src/socket.c +++ b/src/socket.c @@ -7,8 +7,8 @@ #include #include -#include -#include +#include +#include int create_socket(int sin_family, int sock) { diff --git a/src/utils.c b/src/utils.c index 8b4b193..b52cdef 100644 --- a/src/utils.c +++ b/src/utils.c @@ -1,7 +1,7 @@ #include #include -#include +#include void panic(char* message) {